tree 4f19e268f86fbfbd51a9c2481e2a6cad922b5f5e
parent aae4943297a08a659add964a3fef96bdfa0b2c14
parent c56789731fd81144aad48199ded09af6f8de7dd1
parent 9e698c6c3ad1081bfb4a8d1a0d595ea14b5b076f
author The Android Open Source Project <initial-contribution@android.com> 1346101877 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1346101877 -0700

Reconcile with jb-mr0-release jb-release - do not merge

Change-Id: I0387880d7a374b53a5d0f58c7c2234a4ae3cf325