OSDN Git Service

am 8eb948d8: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 20 Jan 2012 23:52:14 +0000 (15:52 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 20 Jan 2012 23:52:14 +0000 (15:52 -0800)
* commit '8eb948d8c8b66d8442a45d398db4e970fb3bf68b':


Trivial merge