tree 3fb10f26c151c767ff771e534adfff91a9565a2d
parent 8fdd8f6576f2ec02da1a5b7c25d9b903b4fe8c05
parent 93d10eda4f4bfd6bafcffb6f3c5bea7662cd0193
author Deepanshu Gupta <deepanshu@google.com> 1400017069 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400017069 +0000

am 93d10eda: am db83a08b: am 86726f58: am eb5b38b1: (-s ours) am a350f96e: 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 '93d10eda4f4bfd6bafcffb6f3c5bea7662cd0193':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]