OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 28 Nov 2012 17:47:48 +0000 (09:47 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 28 Nov 2012 17:47:48 +0000 (09:47 -0800)
commitee76e18125438183d7e7bfa5e2b10172fcf565ec
treef596c33d4e1099c93ed20e7fd6b535b78d967626
parent1aed82c28f1c81d7d21d112d4122fb5608feaf6d
parent2f22e71d3a7a8a500b2499ca63286dc7d50c28b7
Reconcile with jb-mr1.1-release - do not merge

Change-Id: Ib1209178390b84af2e57494299fa9320050154e3