OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0047deb e94ab5e)
resolved conflicts for merge of 12619677 to honeycomb-plus-aosp
authorNick Pelly <npelly@google.com>
Tue, 25 Jan 2011 18:20:02 +0000 (10:20 -0800)
committerNick Pelly <npelly@google.com>
Tue, 25 Jan 2011 18:20:02 +0000 (10:20 -0800)
Change-Id: I3469ca28b32dd2a8e8011f6f50f9297ba07e933e


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