OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Dec 2011 21:08:33 +0000 (13:08 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Dec 2011 21:08:33 +0000 (13:08 -0800)
commit183c525aee3b683f6d92b0b6e7197a3989ddee1a
treec5f62a947aa04afb4e3f5f8f8ddbb569ff8fa0c0
parenta9798d3c1f1c9787975dc0f16e2191da95f2f0da
parentfee0357bd06bb261c26c6030df45db8e1b2a1b73
Reconcile with ics-mr1-release

Change-Id: I123bd5ae61ab8c4f6de1a6640faf0bab89f6aa78