OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba8abb5 50d36d5)
am 50d36d58: am 75bcd737: am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:13:37 +0000 (13:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:13:37 +0000 (13:13 -0700)
* commit '50d36d58369cdf48bc6fcdba96b36c846be8587a':


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