commit | eb5b38b167dd5f094acc085ede494966ed0024c5 | [log] [tgz] |
---|---|---|
author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 21:17:54 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 21:17:54 2014 +0000 |
tree | 22561947d0d13aef1956e26547711de6cce4fa7b | |
parent | b520cc45996de4a172147d4e934768ec6c417666 [diff] | |
parent | a350f96ec97ce5ea6c61683f85f4e39fe45fa42b [diff] |
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 'a350f96ec97ce5ea6c61683f85f4e39fe45fa42b': Use ApplicationInfo only when not in edit mode [DO NOT MERGE]