OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f37143d 3f8fbfd)
am 3f8fbfdb: (-s ours) am 982719b1: (-s ours) DO NOT MERGE ANYWHERE. reset back to...
authorQiwen Zhao <zhao@google.com>
Fri, 10 Jul 2015 01:54:35 +0000 (01:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Jul 2015 01:54:35 +0000 (01:54 +0000)
* commit '3f8fbfdb9bde70454f617ab8f59874bdf132cb29':


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