tree e9a1bacb8a85606851e658ca15b9d1ac35dfc41c
parent 56b95290369c65e4552b9f38ee1de081760e2203
parent e9e4fbef372e33e90157b602f83d85e27211cd99
author The Android Open Source Project <initial-contribution@android.com> 1338398162 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1338398162 -0700

Reconcile with jb-release

Change-Id: Ib078ec6a8d678533d89d2db0d1d8df2fa6c724e8