tree 8b2c2b135bab9ef84ee4377434f6c686976dc87c
parent 425f92b5c168cd91536600051decf31fb34baf2d
parent 786a7e446a0469e37b1f9677499fd212e9a2c28d
author The Android Open Source Project <initial-contribution@android.com> 1338309670 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1338309670 -0700

Reconcile with jb-release

Change-Id: Icde0ecd6b07801c2ae45108e26b70cf99d6c1baa