| commit | e4ea6a3067bfb99e90c59874dc7b5a8dede8742d | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 02:09:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 02:09:55 2014 +0000 |
| tree | 128c5540b20057aa4db9d749f7946fc4930f9b37 | |
| parent | 74ae54e7dc485a82edb1b4876bc1ceaa60a0f34e [diff] | |
| parent | 1d5b9018b208ad39fd3e00ae9d74d331e63e06a3 [diff] |
am 1d5b9018: am 018da2e9: (-s ours) am 1ba310ca: am efa5ffc8: am 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] * commit '1d5b9018b208ad39fd3e00ae9d74d331e63e06a3': Use ApplicationInfo only when not in edit mode [DO NOT MERGE]