OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Jan 2012 15:45:28 +0000 (07:45 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Jan 2012 15:45:28 +0000 (07:45 -0800)
commitddf6c13a12d5e188c1f268c6478baf4244200d52
tree485b152b97bf8321fdd223f35587bb4294672be8
parent42fdc6f3e33f6102010aad911bcb51f31f08172d
parent31815b4f39a59bd67a4eb65592a4111e1bb3331e
Reconcile with ics-mr1-release

Change-Id: I8a74c329fc7dd115e36d5180fab8e8680d6df4f8