| commit | 35419830c69b434c4d2e13a0dd9f396760c63b26 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Thu Dec 05 22:43:40 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:43:40 2013 +0000 |
| tree | adb64c650885008a1b21eaedbeb3b9fc778f44aa | |
| parent | 3f9ceb0cbf925823f6c90e67591f74b9413835c4 [diff] | |
| parent | ccff82ee2f3d44088c4e7dd1de7e11de4150b63a [diff] |
am ccff82ee: (-s ours) am 0c305430: am 436b6ee3: Merge "Catch a few extra users of UserEnvironment." into klp-dev * commit 'ccff82ee2f3d44088c4e7dd1de7e11de4150b63a':