tree b03bbbaed0b57f664f47b7fc860325f97a5e93ed
parent 766b7f578d26c7e528e7d1b21a0a56707a6adf8e
parent d29d91e89b030e6ac5e87a134d1dcd992ad838d2
author The Android Open Source Project <initial-contribution@android.com> 1341347454 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1341347454 -0700

Reconcile with jb-release

Change-Id: I937a350902e0c3aa128d9f33f67994099da8a634