tree d936cbbed0e716729a6af940829e312e8cf9fa1d
parent 5cb3ac0af7dc20299166992f1b5e462f8e9a83e2
parent 38ccd25cc3664bd6166a34ad88b7049ca5b9c98e
author The Android Open Source Project <initial-contribution@android.com> 1363097703 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1363097703 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I5a17c78d674f81b3dce77d54b8023ecc481f4788