OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9cb1acd f89c372)
am f89c3729: (-s ours) am 48a2a5ad: Merge "Merge 6f2fb570 from honeycomb. do not...
authorXavier Ducrohet <xav@android.com>
Tue, 15 Mar 2011 18:57:35 +0000 (11:57 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Mar 2011 18:57:35 +0000 (11:57 -0700)
* commit 'f89c37295db5df34c014e0791c976cfa94509068':
  Merge 6f2fb570 from honeycomb. do not merge.


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