OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81f01ba d00b898)
am 29f28cfe: am e899caf8: Fixed api/current.xml after a bad merge.
authorJeff Brown <jeffbrown@google.com>
Thu, 17 Jun 2010 20:57:05 +0000 (13:57 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Jun 2010 20:57:05 +0000 (13:57 -0700)
Merge commit '29f28cfe2188179519094e35d7fad09588170e88'

* commit '29f28cfe2188179519094e35d7fad09588170e88':
  Fixed api/current.xml after a bad merge.


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