tree 50d24b67ee771ac64ca2bb3779586b802e96b34f
parent 78e7dccc08db81cc95810dc928d956ecf7199853
parent eb19c482b004ea1252427f9ed0962287a2889a8c
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