OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f194e6 2ae141d)
resolved conflicts for merge of 1a4b9939 to master
authorEric Laurent <elaurent@google.com>
Thu, 5 Jan 2012 01:39:12 +0000 (17:39 -0800)
committerEric Laurent <elaurent@google.com>
Thu, 5 Jan 2012 01:39:12 +0000 (17:39 -0800)
Change-Id: I0c910d391a38a916d8431f7d1f5b82e39e1a66c2


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