OSDN Git Service

am aa5bdb1a: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:13:54 +0000 (10:13 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Feb 2012 18:13:54 +0000 (10:13 -0800)
* commit 'aa5bdb1afac03ece211f0375372fcc7d35e4fbbd':


Trivial merge