OSDN Git Service

am 3f3afbef: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 18:01:22 +0000 (10:01 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Feb 2012 18:01:22 +0000 (10:01 -0800)
* commit '3f3afbef0fc7c4199bb7d992dc52efaa6db1b91a':


Trivial merge