OSDN Git Service

am 1bd8111b: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Feb 2012 18:21:31 +0000 (10:21 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Feb 2012 18:21:31 +0000 (10:21 -0800)
* commit '1bd8111bbc62278d5025de8ba5e3418b7477d8a2':


Trivial merge