tree 4195fe073e43573b74f591dea381eba78f4ea4dd
parent 919ce2051595dfa5dd047660946038d23fa688f4
parent c261cb0dcd2ea4ca35dbef1973c0a08709ce5ae1
author Deepanshu Gupta <deepanshu@google.com> 1400014931 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400014931 +0000

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 'c261cb0dcd2ea4ca35dbef1973c0a08709ce5ae1':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]