tree 9e320e9d616516dd7f56782e9e2538d13d6ed088
parent 7c6c49b011f52be82b4e33a0be2f5165b7767978
parent 7b5a743458b0b8db974930594e1de6ccd7219f55
author Deepanshu Gupta <deepanshu@google.com> 1399059533 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399059533 +0000

am 7b5a7434: am 288d32b9: (-s ours) am 17e0eebd: am 465cb53b: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

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