| commit | 6a7210a3d1667b143b3462921df0d9406ca1b62b | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@android.com> | Thu Mar 26 22:38:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 22:38:18 2015 +0000 |
| tree | 694cfb89258d1da48c68092ae1c65d0052646fe4 | |
| parent | 1fdc9cd1ed9ab61d4b973e1545dcb86ed7be09a1 [diff] | |
| parent | a4225912a7fd70ce266ff6a4b6cdfe7fdcf57604 [diff] |
am a4225912: am db39d382: am feb72fef: am 05e449a0: Merge "Correct double-convert from uid to userid" * commit 'a4225912a7fd70ce266ff6a4b6cdfe7fdcf57604':