OSDN Git Service

am c071d874: am 37d6d98f: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 3 Mar 2012 00:51:22 +0000 (16:51 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 3 Mar 2012 00:51:22 +0000 (16:51 -0800)
* commit 'c071d874386564832ba0b4a87242fb786f96764c':


Trivial merge