tree fbb123bc21fa69026c0d4ed4f4bb426fd3e71f0a
parent 074eb387091ca464257601a2d23020e3e10a6915
parent eaf42166f9937b942744deebec363c168cd53d1b
author The Android Open Source Project <initial-contribution@android.com> 1368820471 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1368820471 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I1d5a94ed7749af26f6eb8e5e06443bd83fc63753