OSDN Git Service

am 956abc30: am f8e58c8b: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Mar 2012 23:51:34 +0000 (15:51 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Mar 2012 23:51:34 +0000 (15:51 -0800)
* commit '956abc304f6e03f20f4342988cbba9ac1c27a03b':


Trivial merge