| commit | 67736369dff9c2a5d425b031f8a30a193c493a8e | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 02:38:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 02:38:29 2014 +0000 |
| tree | 3a1647c77205d150f8084a15bc65dd4299a0cb17 | |
| parent | 8c0c7886f00ffd137bf594873c2bcec388bb1986 [diff] | |
| parent | 3067297209f91275c02e802d5d6319805b82510a [diff] |
am 30672972: am aaa0c54a: 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 '3067297209f91275c02e802d5d6319805b82510a': Use ApplicationInfo only when not in edit mode [DO NOT MERGE]