OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 774c7b9 980957d)
am c15901e3: am 925ad384: am 0ff1ecd1: (-s ours) am 3968ae0f: am eb69126c: (-s ours...
authorAndrew Solovay <asolovay@google.com>
Tue, 22 Jul 2014 19:31:12 +0000 (19:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 22 Jul 2014 19:31:12 +0000 (19:31 +0000)
* commit 'c15901e3d8b08e75e64ffa5f479b5d934ad92a9b':
  DO NOT MERGE


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