OSDN Git Service

am c6a1c584: am 6815d49c: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 23 Feb 2012 19:20:16 +0000 (11:20 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Feb 2012 19:20:16 +0000 (11:20 -0800)
* commit 'c6a1c58452bc9207cc7dba8ad40ad0535fb356bb':


Trivial merge