OSDN Git Service

am 3ec476a0: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 23:46:38 +0000 (15:46 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Nov 2011 23:46:38 +0000 (15:46 -0800)
* commit '3ec476a03bcfabdea574d7bbf352e3e46ca8bc28':


Trivial merge