tree e8b8d94ab07c56af0b0d3122f8105d370e1a33ff
parent 64f3c321ffa2c79be8bf0d839528a59bc97df308
parent a491cc4cd01f1e0ddcd745186700f2a9b6f63731
author Edgar Wang <edgarwang@google.com> 1558460534 -0700
committer android-build-merger <android-build-merger@google.com> 1558460534 -0700

Merge "Add Aware Lock Settings" into qt-dev
am: a491cc4cd0

Change-Id: I7dd3de25fe1f1bd681cdfefd33bc9b134937827d