tree 0cbaaeb7661e5196a459ab234355e1a06a8d997f
parent 1b0ebcb6e80bf4e66580808d02fe5da5b4a72ea5
parent 97596b17ccef1015b0625d7cc3248407a9b6210a
author The Android Open Source Project <initial-contribution@android.com> 1339080540 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1339080540 -0700

Reconcile with jb-release

Change-Id: If3c616f2b23e6af3a3db542593af52d08a70b7ee