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