OSDN Git Service

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


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