OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08741a0 2f1e3b4)
resolved conflicts for merge of 2f1e3b4d to master
authorMichael Lentine <mlentine@google.com>
Thu, 29 Jan 2015 01:22:35 +0000 (17:22 -0800)
committerMichael Lentine <mlentine@google.com>
Thu, 29 Jan 2015 01:22:35 +0000 (17:22 -0800)
Change-Id: I68dcde35fb57593140651df67d60f4cafac441dc


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