OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3faf82 62e5655)
am a2a8501e: (-s ours) am 9a4cf569: DO NOT MERGE
authorNicolas Prevot <nprevot@google.com>
Thu, 17 Jul 2014 18:22:50 +0000 (18:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Jul 2014 18:22:50 +0000 (18:22 +0000)
* commit 'a2a8501ed552ec2c7679f079b2118a6eed2827ac':
  DO NOT MERGE


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