OSDN Git Service

am 5cfee77e: am 8013fd39: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 23 Feb 2012 19:19:58 +0000 (11:19 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Feb 2012 19:19:58 +0000 (11:19 -0800)
* commit '5cfee77e400a6e1f51b37e03ce090bc233f1bb8a':


Trivial merge