tree b5bcc6d2cb60ccc11a6a430ca243b2e05c57e76e
parent 613cf6ed49798d66703b7fe5aa8b3f01f3667c42
parent 4f9bb377590f81e80da1caf69243507a5a704189
author Deepanshu Gupta <deepanshu@google.com> 1400017421 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400017421 +0000

am 4f9bb377: 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 NO

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