OSDN Git Service

am b1483cb9: am d32ee5ba: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Jan 2012 20:13:22 +0000 (12:13 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Jan 2012 20:13:22 +0000 (12:13 -0800)
commitcf235b8cd7592ae78644689b08d5eef6f394641b
tree5ea27e23f710c07d6166be3213a9de2d5be1036f
parent9099dc0e2590e8dd6a8064708fe7acf6ea3e80da
parentd9f8d8b0af17a0e2ce30696c1cea4b1bd14711bf
am b1483cb9: am d32ee5ba: Reconcile with ics-mr1-release

* commit 'b1483cb9ca4291791ab6b58cf7b8c5cfea179132':