OSDN Git Service

am 0f03bad3: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Mar 2012 18:43:33 +0000 (10:43 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Mar 2012 18:43:33 +0000 (10:43 -0800)
* commit '0f03bad3fe7e82838c3bedf220fcf1c1056f6ffb':


Trivial merge