tree 3fac87d6a638e786b95b21e387e9e599a638b865
parent 105961ebfd8349e3789d23086b84640b5100e43e
parent 6fbbb9ca4fe6eef41a2485bda29a40e8fc455c81
author The Android Open Source Project <initial-contribution@android.com> 1352232974 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352232974 -0800

Reconcile with jb-mr1-factory-release - do not merge

Change-Id: I470d1b8e5f8bc1766187486d2ea8950ed45431c6