OSDN Git Service

am 7490f9bf: am b4ff7281: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 18:10:28 +0000 (10:10 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Feb 2012 18:10:28 +0000 (10:10 -0800)
* commit '7490f9bf37a1bfcad8e6c868d878dd56fd4c09ca':


Trivial merge