OSDN Git Service

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


Trivial merge