tree e2db23535635f98e37b5324a9057bbe489000ab2
parent 79f2e1afbc08cd0cbcddc70cde5e3b7f1f0afea4
parent 8c09d0d80d6e324d25a961da1960cd412397b6a6
author The Android Open Source Project <initial-contribution@android.com> 1338398116 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1338398116 -0700

Reconcile with jb-release

Change-Id: If0a430615dadb425b82aa27204e6c670f06ee099