| commit | bec331e0ef14f2b7fb9b4b40b53e08e89f636748 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 02:41:48 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 02:41:48 2014 +0000 |
| tree | d93d98dc93b81742847f97f0c6afd005658d10de | |
| parent | 37dd3aebf79972314e7aea823898f3a0b56da15d [diff] | |
| parent | 67736369dff9c2a5d425b031f8a30a193c493a8e [diff] |
am 67736369: (-s ours) 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 '67736369dff9c2a5d425b031f8a30a193c493a8e': Use ApplicationInfo only when not in edit mode [DO NOT MERGE]