OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Nov 2012 15:26:14 +0000 (07:26 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Nov 2012 15:26:14 +0000 (07:26 -0800)
commit725a2ffe3b615515acd14b8b379078930de64249
treee0111f77575d92e7ffce0f9c8e928f77d2096020
parent7259d88c08df220095a4aeaa752bd8e1055f4e83
parent9a7debe5857ffc7c71cfc4082b1b6d72a5cf81cd
Reconcile with jb-mr1-release - do not merge

Change-Id: I310560c329cb0d8aeb664c67ea6e67e006809637