tree c43a14fc83418fe6bc5db02299135a227394f061
parent ec1b4df6d2ccfe35c251344b43a29af65c3b56e1
parent ebd909cca1f69028878f15e6fb0ece6e8c8da584
author Deepanshu Gupta <deepanshu@google.com> 1400014086 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400014086 +0000

am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

* commit 'ebd909cca1f69028878f15e6fb0ece6e8c8da584':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]