| commit | 86726f58dba0f2ee6d7e62255dbf7356a7201897 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 21:23:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 21:23:37 2014 +0000 |
| tree | 1629b381d37037c68755d90861a8b41d13113a58 | |
| parent | 0573cffacc4a7247151aae62d176a9e947e1dabe [diff] | |
| parent | eb5b38b167dd5f094acc085ede494966ed0024c5 [diff] |
am eb5b38b1: (-s ours) am a350f96e: am 0eb268a0: am 22dabb52: (-s ours) am c261cb0d: am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] * commit 'eb5b38b167dd5f094acc085ede494966ed0024c5': Use ApplicationInfo only when not in edit mode [DO NOT MERGE]