OSDN Git Service

am 0e511149: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Feb 2012 17:04:04 +0000 (09:04 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 Feb 2012 17:04:04 +0000 (09:04 -0800)
commitb384f3605ecae338eb28e6ef5e8bc876981058e0
tree312513dc0ad49da7daf2ec0c3a8d8e9c456a7d27
parentae2fa4a5bec4574c5da9f32f9f637bd733ab16d0
parent0e51114927aecac7a283eee4d6449709027224d5
am 0e511149: Reconcile with ics-mr1-release

* commit '0e51114927aecac7a283eee4d6449709027224d5':