tree b7ecb90b14abd16341d34d0118f19da95ab15400
parent 6c59bc140981a064431fc8555d78de7d539d9b0c
parent ad78b33d9d002643fdb3f8e9d376a36d78212089
author The Android Open Source Project <initial-contribution@android.com> 1350311911 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1350311911 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I1253d2b70d2ba5be1771d5824386c8c42bdbdf0f