tree db7296db2019b7b31e17ace2d9b3a35fe20fe59b
parent b4ad998906c79cfbfeba4d714cded2d2a65a9bc7
parent c97a9de4925c558cf88f0d2575f9d1e00733af0e
author The Android Open Source Project <initial-contribution@android.com> 1355852664 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1355852665 -0800

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

Change-Id: Ib82925ec511d04952e13627e52f188ecb3ceebb7