tree 5f4b139b9d58a22e29f927a75a0cd63faaa93f92
parent 9b32313a78fb7b45e35f313f159ba87cef81c3f0
parent c6de4240d50a89c52711e3bfbf579b68e399ee7f
author Amin Shaikh <ashaikh@google.com> 1521767905 +0000
committer android-build-merger <android-build-merger@google.com> 1521767905 +0000

Merge "QS edit mode fixes." into pi-dev
am: c6de4240d5

Change-Id: I33179a69d3805e454e04655e8760c8d322d89377