| commit | 3067297209f91275c02e802d5d6319805b82510a | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 02:30:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 02:30:29 2014 +0000 |
| tree | f80e8a221f52c5cc58cad07886fdad255ec500ca | |
| parent | 61012649b604836db684c448071d444d3a5f0704 [diff] | |
| parent | aaa0c54a6255d87bc713b565e916be65ef010908 [diff] |
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 'aaa0c54a6255d87bc713b565e916be65ef010908': Use ApplicationInfo only when not in edit mode [DO NOT MERGE]