OSDN Git Service

am d58f3d2b: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 Feb 2012 22:09:27 +0000 (14:09 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Feb 2012 22:09:27 +0000 (14:09 -0800)
* commit 'd58f3d2bc47015f7a55b88ff56850b9990689e22':


Trivial merge