commit | db83a08b133d5c618d21ba105b0852e463cfb6d7 | [log] [tgz] |
---|---|---|
author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 21:28:12 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 21:28:12 2014 +0000 |
tree | 8fe0d234dd5b2bb31f7b9460e535a2b5f672eb59 | |
parent | 84cea70792145e345d5bde8838dad14cc3e9fa4c [diff] | |
parent | 86726f58dba0f2ee6d7e62255dbf7356a7201897 [diff] |
am 86726f58: 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 '86726f58dba0f2ee6d7e62255dbf7356a7201897': Use ApplicationInfo only when not in edit mode [DO NOT MERGE]