Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Oct 2012 14:29:43 +0000 (07:29 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Oct 2012 14:29:43 +0000 (07:29 -0700)
commit6ef93cabf7bf9adcc9274555cf7f4323202b4308
tree5c9151d63e2ff75e08fc5e088d97f05fc978abad
parent27dc36077f62c47e9739103e0cce029f67828264
parent3d63220485310058e133a56b8f8fd9d3c9b779ca
Reconcile with jb-mr1-release - do not merge

Change-Id: I9deaa80a720da8fddae2d5420a75ec8c6247413a