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)
* commit 'da29653305f299d6390492333a6360cfa78665d9':


Trivial merge