tree efc337f9376ab4a82d3fe5e20cdc0a01a765d5a8
parent 565cab11ff5b45f2f729e48fe9784f7efb4199ee
parent cb5e0e63b4b7f452aab69abeea44f96fbd05a202
author Jason Monk <jmonk@google.com> 1501613281 +0000
committer android-build-merger <android-build-merger@google.com> 1501613281 +0000

Merge "Cleanup QS dialogs" into oc-dr1-dev
am: cb5e0e63b4

Change-Id: Ib51f630bfe644e9deaec73c32dc4f3d6aa9237b5