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