OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20ad955 b7b877a)
am b7b877a4: (-s ours) am 0a98226e: Merge 9d76581f from honeycomb. do not merge.
authorXavier Ducrohet <xav@android.com>
Tue, 15 Mar 2011 19:05:46 +0000 (12:05 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Mar 2011 19:05:46 +0000 (12:05 -0700)
* commit 'b7b877a45f469336703844a928482e6438442567':
  Merge 9d76581f from honeycomb. do not merge.


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