OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29694c0 3fc5d28)
am f9335c1f: (-s ours) am 97664784: Merge "Asset cleanup. DO NOT MERGE" into gingerbread
authorGilles Debunne <debunne@google.com>
Tue, 11 Jan 2011 21:53:43 +0000 (13:53 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Jan 2011 21:53:43 +0000 (13:53 -0800)
* commit 'f9335c1f23270b0b0d2649f6a95fe7f4cc0422ee':
  Asset cleanup. DO NOT MERGE


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