OSDN Git Service

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


Trivial merge