OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 16:49:28 +0000 (08:49 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 16:49:28 +0000 (08:49 -0800)
commitaf140189514d64be270439303eb0f0ab26583af5
treee2f340784edb0c58bc3bc5bb890dc40254310bdd
parent1c7e1e149d3dcf3949c76ae594ca9c1ca20392f9
parent42474c1e646c3171d33fa9dd13acebda509eb4e2
Reconcile with ics-mr1-release

Change-Id: Ib9dd6f8b4d4f3d978450cf0db6a3a598adad6fea