tree e3d08af5c6e8b9d3f0f39642953e2ee08059eab9
parent bb4da9f62ae6ba34005c88a8418b1220674fd190
parent 2ed1ced511e7e4b341b5fcbc7fdbb4c06ca00627
author The Android Open Source Project <initial-contribution@android.com> 1363797145 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1363797145 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: Iecd0796991c64c443b80377c3fe211ecd753010f