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)
commit270d6271667b3d8bdabe10f2121d9c9c5aa028b0
tree0efe8e381ec1cb061ac1656849435dbc73862c6a
parent7f114ff55314cbb923c27a90bc23ffb9ed6ad6a1
parent23fcf955f2cb3bab68b51d82e9ebe21864b6a71d
am c6a1c584: am 6815d49c: Reconcile with ics-mr1-release

* commit 'c6a1c58452bc9207cc7dba8ad40ad0535fb356bb':