OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c1e815 d60b0ca)
am 67d6590d: am 2a547829: Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e2...
authorScott Main <smain@google.com>
Sat, 10 Apr 2010 18:48:20 +0000 (11:48 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 10 Apr 2010 18:48:20 +0000 (11:48 -0700)
Merge commit '67d6590d242397acbb95814139301d2e6efd3631' into kraken

* commit '67d6590d242397acbb95814139301d2e6efd3631':
  cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96


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