| commit | 325820e197bff5fcd8266d73997cea4aa12f9030 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Tue Sep 09 23:56:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 09 23:56:38 2014 +0000 |
| tree | 0f23b2b1361738d96dd5cb69b48e841d0088b40f | |
| parent | 16935e2f3a6ba03f622c925a8eceddf84d2163c3 [diff] | |
| parent | 732edf098fe9728238bf3b69a3b3cfcb221edf35 [diff] |
am 38bd55ff: Merge changes I79ba54d7,I224fb4b6 into lmp-dev * commit '38bd55ffd7084d744e4e814593056e1e12ebfb00': Make UsageStats API default on only for the system ActivityManager shouldn't return null for getCurrentUser