OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 5 Dec 2011 16:53:37 +0000 (08:53 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 5 Dec 2011 16:53:37 +0000 (08:53 -0800)
commit467a3f3ea4830b4f4d9cb5b68f2f6ee638648801
treee2ae11f95f4f4ac4aae1ee920af112f5a2fd565d
parent51ecb2eb5ce2a2a6fcf05c1a372242686ce7c787
parent53ea28aa02caa4963f376254299afdf6c1de9765
Reconcile with ics-mr1-release

Change-Id: I50ea08700096cc77b6af3838bb4adbc21062de1c