tree 192ce9c9fb37969752ba2c41895e58ad74741674
parent e4fe85568b52b6a25b62be9b06e9d9e59425fae9
parent 17e0eebdc6223de1f94b5ee538919adda9f58a9a
author Deepanshu Gupta <deepanshu@google.com> 1399059043 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399059043 +0000

am 17e0eebd: am 465cb53b: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

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