OSDN Git Service

am e4ea6a30: am 1d5b9018: am 018da2e9: (-s ours) am 1ba310ca: am efa5ffc8: am 90ce58e...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 02:14:50 +0000 (02:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 02:14:50 +0000 (02:14 +0000)
commita8499a1648d47f1b49df6c0a01681c085f9372e2
tree64159a94b94844e532ebc100925f55fdfb52a163
parent7aaa59f00ed277fdea2fed7ea23a8d24ee219cd2
parente4ea6a3067bfb99e90c59874dc7b5a8dede8742d
am e4ea6a30: am 1d5b9018: am 018da2e9: (-s ours) am 1ba310ca: am efa5ffc8: am 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

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