tree 05ee8c884d38baeac3a90386b7d3d88938ddac66
parent 9438b9c3fba52067740a21cde02385f48590ea8f
parent c2125cbd154a7352b08c7c1dacd266b6a406b977
author The Android Open Source Project <initial-contribution@android.com> 1340378239 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1340378240 -0700

Reconcile with jb-release

Change-Id: Ia52def758eb08d6651dc08cf8e30df1168b0cf95