tree 7d490a304199cd22bf8f5a687d5257e5e694c07f
parent a740925b5a7444f9d11fdc0419a672a753ab217e
parent 7ce375d8fc95b26a4ca3961680dd559d541c3fe8
author The Android Open Source Project <initial-contribution@android.com> 1339431640 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1339431640 -0700

Reconcile with jb-release

Change-Id: I422adc54841a9693fe9cf81b488dd8817251328b