tree 3489c48a31d7afbae4c5eff45ad791133e90c2af
parent b988662560928d109bc0bfc6ac5fa3d805fdd45d
parent 4af6a3c42e273ab8326bba37f44784b6a6e8cdea
author The Android Open Source Project <initial-contribution@android.com> 1349274815 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349274815 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: If8dd7e709eebee87512dbe33d7ed6858a7597593