OSDN Git Service

am 4d00f912: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 3 Mar 2012 00:35:25 +0000 (16:35 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 3 Mar 2012 00:35:25 +0000 (16:35 -0800)
* commit '4d00f91201adc92d2d7fc56322f264db2fa7c816':


Trivial merge