OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 5 Feb 2013 21:43:19 +0000 (13:43 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 5 Feb 2013 21:43:19 +0000 (13:43 -0800)
commitc43e8a9cdfce2852d6eaed0d2d0ad8a6205b0f40
treec71a9fce63e3669e7a7a9d6c58d0138527531542
parent70bb7d04dd7085727a6ea9511abd5dbf8c3579ee
parenteed4696728365368642ff9407624ac86bb001ae7
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I8c2fd056e6eea6c8d818aa44ced9421f84f64fe5