tree a5ff40a55dc238f6475252f15c10500a5ce0f3b6
parent a96fbc672886ddac5169a7e8ddbfecf535770669
parent 76be5a9f98b6d6dda72eed255a801ae53188d17a
author The Android Open Source Project <initial-contribution@android.com> 1340111633 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1340111633 -0700

Reconcile with jb-release

Change-Id: Idee820191b52f081d94c11787fe89452e1bf073d