OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Sep 2012 14:41:05 +0000 (07:41 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Sep 2012 14:41:05 +0000 (07:41 -0700)
commitec2deda6e3a94fa1768a61b5f3c09c042df18a89
tree3a528f501f95e5bc492711ade3045c7bc1ef93a2
parent96a77f092ba92589a68915a5ad3170854ea78397
parentff5f0fb5011b0365e119e810164edd85857350c6
Reconcile with jb-mr1-release - do not merge

Change-Id: I190165deaba5ac670791cca5ab2da7d4aefd1d5f