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)
* commit '0e51114927aecac7a283eee4d6449709027224d5':


Trivial merge