OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:10:48 +0000 (10:10 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:10:48 +0000 (10:10 -0800)
commitfe548d6a965bfa990e1f9b291a3e526e52c5ad38
tree74f88cb0e90082cd357f603b6025281e6b616ff7
parent87712d44052e90068f6aa6e021d652b21918e60b
parent7a79be81b0ba93a0ff1b9744f8e0a3feece8131c
Reconcile with ics-mr1-release

Change-Id: Iabe8f7374f8e66b88775543fb58d075f13088cbd