OSDN Git Service

am cb20fab2: am aac21480: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 Feb 2012 22:04:16 +0000 (14:04 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Feb 2012 22:04:16 +0000 (14:04 -0800)
* commit 'cb20fab2ee39cfcb43400b88098b75a8aab4b0e0':


Trivial merge