tree ef3eadabdd66dd30392c9a451410c5ad3950294c
parent d612ec14226d082d246d8448637d15888733a8b9
parent 38b12d816c2dd8907d6d36dc25af8d1f2e84dc96
author The Android Open Source Project <initial-contribution@android.com> 1350052279 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1350052279 -0700

Reconcile with jb-mr1-factory-release - do not merge

Change-Id: Id7a41d6b5c55960694407d194c496766eaefb5d2