OSDN Git Service

am 175d5d76: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Dec 2011 23:29:56 +0000 (15:29 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Dec 2011 23:29:56 +0000 (15:29 -0800)
* commit '175d5d76b0aa9808b4214522a6fdf461109560ec':


Trivial merge