OSDN Git Service

am 21cb1290: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Dec 2011 21:11:53 +0000 (13:11 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 20 Dec 2011 21:11:53 +0000 (13:11 -0800)
* commit '21cb1290b578a4bceac003c276c00911fcd6c9d4':


Trivial merge