OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1c84cf ace62f2)
am c1761e7f: Fixed build after merge
authorGilles Debunne <debunne@google.com>
Tue, 13 Dec 2011 00:16:05 +0000 (16:16 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 Dec 2011 00:16:05 +0000 (16:16 -0800)
* commit 'c1761e7fe10390d90b805f373b51ecaabf214dac':
  Fixed build after merge


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