OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 2 Dec 2011 15:53:10 +0000 (07:53 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 2 Dec 2011 15:53:10 +0000 (07:53 -0800)
commit48bd916ffef341335237a4fa54d69c9deab1ab3c
treee755c472a80ff39ffac15d74460855e9f5dc725e
parent17078d8a83becd5bfb49a39f1415882b78d07a49
parent42fb390d04ae77ff72a1ff41d32be04079b3c98b
Reconcile with ics-mr1-release

Change-Id: I1c603308272f9b00174c3f9046171e069ffee566