OSDN Git Service

am 27239099: Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 22 Nov 2011 23:16:08 +0000 (15:16 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 22 Nov 2011 23:16:08 +0000 (15:16 -0800)
* commit '2723909903b68db016666a13ec897581a8915636':


Trivial merge