OSDN Git Service

am a8499a16: (-s ours) am e4ea6a30: am 1d5b9018: am 018da2e9: (-s ours) am 1ba310ca...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 02:19:50 +0000 (02:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 02:19:50 +0000 (02:19 +0000)
commit83b43dc0c98abc416bff1e518206e9dda5244e28
tree4c80745ebc16bb61288714196133a7fad6708f9b
parent59889153bae4f3f6a3270ef6eae69f1a937eeb4a
parenta8499a1648d47f1b49df6c0a01681c085f9372e2
am a8499a16: (-s ours) 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 'a8499a1648d47f1b49df6c0a01681c085f9372e2':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]