OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 24 Sep 2012 17:13:12 +0000 (10:13 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 24 Sep 2012 17:13:12 +0000 (10:13 -0700)
commit099eeb328d862cdd7e1e489f4ed3e4344de22e68
treef16633767d762e4a3f7b6c5717a8418a19186acf
parent23c7f7672b05e65839da97b3ec6923381fa3e177
parent153f41c3c1842db66a6458152f4f17950f8fbfad
Reconcile with jb-mr1-release - do not merge

Change-Id: I11d8713eb61744492dd1768c2e5f8e08f7bd3ee7