OSDN Git Service

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


Trivial merge