tree bd8240eeae77cc594dd519e9edde92e3ef855eaa
parent 3ce15fcc916e097b6a98efc57302e012dab69d6f
parent 4a21072095e80986d577bf482fce7cf387e39863
author The Android Open Source Project <initial-contribution@android.com> 1368708257 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1368708257 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I731b1db7da9f82dbb92a3e1dc40bfab1a3f307e2