| commit | a8499a1648d47f1b49df6c0a01681c085f9372e2 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 02:14:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 02:14:50 2014 +0000 |
| tree | 64159a94b94844e532ebc100925f55fdfb52a163 | |
| parent | 7aaa59f00ed277fdea2fed7ea23a8d24ee219cd2 [diff] | |
| parent | e4ea6a3067bfb99e90c59874dc7b5a8dede8742d [diff] |
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 'e4ea6a3067bfb99e90c59874dc7b5a8dede8742d': Use ApplicationInfo only when not in edit mode [DO NOT MERGE]