OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 452f5a1 147372f)
am 147372fd: resolved conflicts for merge of 67d8bd66 to lmp-mr1-dev-plus-aosp
authorLajos Molnar <lajos@google.com>
Fri, 19 Sep 2014 13:33:22 +0000 (13:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Sep 2014 13:33:22 +0000 (13:33 +0000)
* commit '147372fdf9fae688114121228247497d43514ab7':


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