OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35b29de 902fb85)
am a058f565: (-s ours) am ca36d863: Update API current.xml to unbreak build.
authorNick Pelly <npelly@google.com>
Thu, 13 Jan 2011 01:57:30 +0000 (17:57 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Jan 2011 01:57:30 +0000 (17:57 -0800)
* commit 'a058f565663253077c3118d9aad00e03dcd45684':
  Update API current.xml to unbreak build.


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