tree 5009e41f3f7812c303cd55ee9e2d0af5106a484e
parent 673d9734c2d9b62ecd41dcac3c730d242952989e
parent 4eab4e14c8453a0b41923c714a05dccdd72d7829
author Deepanshu Gupta <deepanshu@google.com> 1400002849 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400002849 +0000

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

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