OSDN Git Service

am 4b067bdf: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:11:48 +0000 (10:11 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Feb 2012 18:11:48 +0000 (10:11 -0800)
* commit '4b067bdf05bd8fca840253a43fb0ff25846d35c1':


Trivial merge