tree 2a54509d4aae599873fe33951d4f504d5a14b068
parent d50926a047d51f950cbe6c7588d4b168e0cfc3bb
parent ba7bed755208fd72e626f14eb82c3f73643466c5
author The Android Open Source Project <initial-contribution@android.com> 1348675097 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1348675097 -0700

Reconcile with jb-mr0-release - do not merge

Change-Id: Ia744536ee9da563e661fdcd84defb22720d76309