OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:18:27 +0000 (12:18 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:18:27 +0000 (12:18 -0800)
commit209cdc3b7ac92efb6427910916d04fb93083bcfa
tree5fcb94764c3e99acdc2f28f945a400e1d4660af8
parentc36184a884d817bec9d9eb1e89bdbedea329ff95
parent08c0e3c6716d322c5237efdf3b941b7decbf175d
parent3a28950e70b47bcba2c4070c73c6ce765e55c575
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ia95ceb234c77dafcedb79274226f4bd279c63c79