OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02f7f44 0974061)
am 0974061e: (-s ours) am 1181564f: am 42fb3abd: DO NOT MERGE. cherrypick from I3653f...
authorXavier Ducrohet <xav@android.com>
Tue, 7 May 2013 23:12:14 +0000 (16:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 May 2013 23:12:14 +0000 (16:12 -0700)
* commit '0974061e941f3aa8c3c5c71ca996be5f93a6a865':
  DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be


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