OSDN Git Service

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


Trivial merge