tree 902a1439dac8e33d87fd1fe9c2259760df6c3788
parent f888888a6278d53192bd00b0665c0d39b3cdb6e0
parent 856d765487a0fb3d1b3532fc3cb66a4fa45c28dd
author The Android Open Source Project <initial-contribution@android.com> 1340111597 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1340111597 -0700

Reconcile with jb-release

Change-Id: I8d723033a1d479bd9ef5973cb098b488c54c6c62