tree 83fe3e2501455b2d4d7ef7cc6b0e1eb2ff39a515
parent bda0841448a2339d355e12db96d00de55deb3c8b
parent 0e7f0f6bbd2fa6485756acb778c7aa180318cca6
author The Android Open Source Project <initial-contribution@android.com> 1355956414 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1355956414 -0800

Reconcile with jb-mr1.1-release - do not merge

Change-Id: Iec6ae54fc15dc7057a957efb92543cac35bbae32