OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 5 Dec 2011 16:53:06 +0000 (08:53 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 5 Dec 2011 16:53:06 +0000 (08:53 -0800)
commit6433c4933b8799530979f7b0e789dd8d10ce7583
treeb21a43612c5d1debb36d22ccbbd50a5093636c8a
parent5d6f61083386bdf25f2fa9ba18cd40fd6839ba70
parentc383c3a3b16a97b5ba7333acb5525b0dfcddb235
Reconcile with ics-mr1-release

Change-Id: I35fea7fba390129cec15616718e2880bfa3b414c