tree 88d2192a580a8264fcd6cd3dbd83b211376730c2
parent 45d0eafb35cc3a78600cf89f77a26720806f0819
parent bc3de9a8a4ef8903e9e22e3412998c4963e0d7b3
author The Android Open Source Project <initial-contribution@android.com> 1355255673 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1355255673 -0800

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

Change-Id: I02c7dfdcf1793b4c78a14b82e750962b95a23359