tree 1ce19922396c657ebbc4d4da545cfa976999429d
parent cf2af66180e7debda36a1cece4732d0403ce37b7
parent 0eb268a0de02b73dd23ab2e672c35a2650a9eea4
author Deepanshu Gupta <deepanshu@google.com> 1400015552 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400015552 +0000

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