tree 43cd11907cc01db165e807ddf6165dd3911da916
parent f9cce805fe306239ee427867484b222835a3681b
parent ae6776a83994623862e26e23b06c4f67a8b4f544
author Christine Franks <christyfranks@google.com> 1500947033 +0000
committer android-build-merger <android-build-merger@google.com> 1500947033 +0000

Merge "Don't display QS security footer in demo mode" into oc-dr1-dev
am: ae6776a839

Change-Id: Iace19d7405aae6b47fb33342dc3419921ebf6a5e