OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fdb20e 8e2bb37)
resolved conflicts for merge of 07bacabe to master
authorAndreas Huber <andih@google.com>
Mon, 5 Dec 2011 21:30:52 +0000 (13:30 -0800)
committerAndreas Huber <andih@google.com>
Mon, 5 Dec 2011 21:31:17 +0000 (13:31 -0800)
Change-Id: Idb56996f7c1b78d96e3d3d3f08419c4d122db0b1


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