OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Nov 2012 20:41:05 +0000 (12:41 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Nov 2012 20:41:05 +0000 (12:41 -0800)
commit11dd4b998dfadf5a7eeaec5228cfb6100c855608
treec28bab3111037060f097a01ea4db127678dc1f90
parent41f7736ad1e72df8796416a82ce3cede6193d1eb
parent2d3d9d11ba12a4f92c1e1787648e8522da617206
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I7915c2abffbc99177c1fec8cf47dfd5c43d88d20