OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Mar 2012 18:40:59 +0000 (10:40 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Mar 2012 18:40:59 +0000 (10:40 -0800)
commitb2a0ea3541191318a8810cef63a2d2b7d9566e4e
treef4b5f1d959f7bc751015967fcf63382e4f89abee
parent9220d367eb30ba8f5375627cd782921b82c8b332
parent815b2f3467aa1d1e98be7a0e2e8e5a6a8c8094ef
Reconcile with ics-mr1-release

Change-Id: Ie559363abe963201d622a17caae6827d8a22e44e