OSDN Git Service

am 57129a21: am 520b7ee0: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Dec 2011 23:03:54 +0000 (15:03 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 Dec 2011 23:03:54 +0000 (15:03 -0800)
* commit '57129a21e1865bb44ea4c4a93f75ed996c9b2764':


Trivial merge