OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f841a4 35ef14c)
am 96236bc8: (-s ours) am fa73815e: am e4ef9b1a: DO NOT MERGE (from master: Fixed...
authorfelipeal <felipeal@google.com>
Tue, 28 Feb 2012 22:59:26 +0000 (14:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Feb 2012 22:59:26 +0000 (14:59 -0800)
* commit '96236bc8d93efc0573a18b87699d56a3ed8c0b0b':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)


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