OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ec2178 3d56404)
am 3d564043: am 7b5a7434: am 288d32b9: (-s ours) am 17e0eebd: am 465cb53b: Use Applic...
authorDeepanshu Gupta <deepanshu@google.com>
Fri, 2 May 2014 19:43:24 +0000 (19:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 2 May 2014 19:43:24 +0000 (19:43 +0000)
* commit '3d5640437600537333f436311d0d45dffa790e0a':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help