OSDN Git Service

am ce77af47: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 12 Jan 2012 17:00:21 +0000 (09:00 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 12 Jan 2012 17:00:21 +0000 (09:00 -0800)
* commit 'ce77af47e979d365155e4003ca2943b639600e73':


Trivial merge