OSDN Git Service

am da296533: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 13 Dec 2011 13:40:57 +0000 (05:40 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 Dec 2011 13:40:57 +0000 (05:40 -0800)
commitdaff3b4b2b1549e45291532fdd67499c0315b688
tree76a85ebc08e2538fb6a27cea972455efcc38a856
parent812cc587cfb32f24d40cadfeba4358fcee6e0f70
parentfca20c9b5dffa9e352632fee97e301f30d74bd49
am da296533: Reconcile with ics-mr1-release

* commit 'da29653305f299d6390492333a6360cfa78665d9':