tree 7d5bfe8091ce0ff2b479d823c1d596fe6d80c0e1
parent 8b1d7408854535f1f6e556766c2436647faf51fe
parent 8f1d8145d560ce4dae08e18cf7fef3a3fbe82143
author The Android Open Source Project <initial-contribution@android.com> 1354895610 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1354895610 -0800

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

Change-Id: I5b78989adfb6298877bf213ef46ea714bc7fd521