OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c68a657 2ba92c7)
am 2ba92c71: (-s ours) do not merge bug 3370834 Cherrypick from master
authorJean-Michel Trivi <jmtrivi@google.com>
Sat, 29 Jan 2011 17:54:41 +0000 (09:54 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 29 Jan 2011 17:54:41 +0000 (09:54 -0800)
* commit '2ba92c71b5684dce700cf848bf157153c156df1d':
  do not merge bug 3370834 Cherrypick from master


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