OSDN Git Service

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)
commite8a00ad288e36204cab2ba2407b42525fe2e44e0
tree19c0985c9095029ae4fba30d617f263858ed8a38
parent9cb1acda89919a46583444f788f4808fecd5d78d
parentf89c37295db5df34c014e0791c976cfa94509068
am f89c3729: (-s ours) am 48a2a5ad: Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread

* commit 'f89c37295db5df34c014e0791c976cfa94509068':
  Merge 6f2fb570 from honeycomb. do not merge.