tree 2f2fc681dc3b8359d3ed8ede9053209475ff6195
parent 2e6428668c97826e169e51ac5d0a7c6e8ba3bd79
parent 199bc563e3afb13dee44aec1eeda6be80188caca
author The Android Open Source Project <initial-contribution@android.com> 1348497546 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1348497546 -0700

Reconcile with jb-mr0-release - do not merge

Change-Id: Ic8d0d91f79b5766b639695d8769e386958706e34