tree a5ff40a55dc238f6475252f15c10500a5ce0f3b6
parent 470b311e82a9a9d9b8d9609b7c9763403bd33081
parent 9d6aaa8c6818b41b4c356d78232206e8a0593c8a
author The Android Open Source Project <initial-contribution@android.com> 1340115362 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1340115362 -0700

Reconcile with jb-release

Change-Id: I498b24819154fc97ab5f846cd088810d68a982ea