OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b93bca5 e9b6f1f)
resolved conflicts for merge of e9b6f1f7 to lmp-mr1-dev-plus-aosp
authorDmitriy Ivanov <dimitry@google.com>
Thu, 11 Dec 2014 00:10:44 +0000 (16:10 -0800)
committerDmitriy Ivanov <dimitry@google.com>
Thu, 11 Dec 2014 00:10:44 +0000 (16:10 -0800)
Change-Id: I87618573198d1f476b1680dbf9163a7dc90a66f8


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