OSDN Git Service

am 98e1b541: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Mar 2012 16:06:34 +0000 (09:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 21 Mar 2012 16:06:34 +0000 (09:06 -0700)
* commit '98e1b541f271e92b9dc25d54e275c28102746b04':


Trivial merge