OSDN Git Service

am 7b276302: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:06:42 +0000 (10:06 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Feb 2012 18:06:42 +0000 (10:06 -0800)
commitcca3be2bc474191f9d86e00e55152771803727d6
tree02fa72becc778b81b85364f47c668ea03a59ded3
parent41e16eaa038fe4adeb8a3566b440aa23c1928c98
parent7b2763021750a2d138eaa20ee2d2828d83d1720c
am 7b276302: Reconcile with ics-mr1-release

* commit '7b2763021750a2d138eaa20ee2d2828d83d1720c':