OSDN Git Service

am 40375099: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Dec 2011 23:39:19 +0000 (15:39 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Dec 2011 23:39:19 +0000 (15:39 -0800)
* commit '40375099d10139b6c96c1db8b8295874d60c712e':


Trivial merge