tree 781c41a9c93fb26a6dad4706c28476298f4b892c
parent 4142f70c5836f0b2830a3d22a02cc6781084bd5b
parent 0d7d7abdb81288609f014a89a9f00f05ac60a53e
author The Android Open Source Project <initial-contribution@android.com> 1354734562 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1354734562 -0800

Reconcile with jb-mr1.1-release - do not merge

Change-Id: I542ccd948f3a80e402ce6d80e8951091c8e07001