OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc11bbf 04c9683)
resolved conflicts for merge of 04c9683a to lmp-mr1-dev-plus-aosp
authorJesse Hall <jessehall@google.com>
Fri, 31 Oct 2014 22:41:03 +0000 (15:41 -0700)
committerJesse Hall <jessehall@google.com>
Fri, 31 Oct 2014 22:53:38 +0000 (15:53 -0700)
Change-Id: I83fdaf504ca37536c277a146c1d624e44cfe11b0


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