| commit | aaa0c54a6255d87bc713b565e916be65ef010908 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 02:25:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 02:25:03 2014 +0000 |
| tree | 88ef4d03492018a51205f14e2c101a8abc882c24 | |
| parent | 7b935e257262ec0c5c0e8d7eb6fb5792ab478003 [diff] | |
| parent | 83b43dc0c98abc416bff1e518206e9dda5244e28 [diff] |
am 83b43dc0: am a8499a16: (-s ours) am e4ea6a30: am 1d5b9018: am 018da2e9: (-s ours) am 1ba310ca: am efa5ffc8: am 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] * commit '83b43dc0c98abc416bff1e518206e9dda5244e28': Use ApplicationInfo only when not in edit mode [DO NOT MERGE]