OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 Feb 2012 22:05:46 +0000 (14:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 Feb 2012 22:05:46 +0000 (14:05 -0800)
commitd58f3d2bc47015f7a55b88ff56850b9990689e22
treecb5a7174747aedb658f5e270d9b473fb5e5fb90f
parentd0d7086fb6012b72731fcefeabe92edccaaf89eb
parentea6f0e027d252290e172f388c03b425165727e68
Reconcile with ics-mr1-release

Change-Id: Idc7bbf210376184867a6265475e34967c00b1315