OSDN Git Service

am 228e4716: (-s ours) am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge.
authorXavier Ducrohet <xav@android.com>
Sun, 29 May 2011 16:00:16 +0000 (09:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 29 May 2011 16:00:16 +0000 (09:00 -0700)
commit59e699f13db9a32f30108e25577685bb39b3dae4
tree6dc4adba0b1af2275895cc24beb516b08cb9d038
parent311f9493dfa88d455ff0ea25f86e508a6852682d
parent228e4716278f450a95be5addacc3c6c940668493
am 228e4716: (-s ours) am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge.

* commit '228e4716278f450a95be5addacc3c6c940668493':
  Merge 6103e22c from honeycomb-mr1. do not merge.