tree dde9ec590d1163b6768def5f954636834f136448
parent b161d6ba7f85b49e4e19d69bd107d30cdd3c0bc1
parent ae5e0c7b9f24564547d38a77641b120d6685dd5a
author Deepanshu Gupta <deepanshu@google.com> 1400002923 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400002923 +0000

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

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