tree 2797259a02fb4b4bb287771f9a067e71001935f0
parent 10ad8b6353ac54fb77fc76448e0e05484c88f551
parent 9423025444e7fa46f118ce6c2524709b41a885e5
author Edgar Wang <edgarwang@google.com> 1569057289 -0700
committer android-build-merger <android-build-merger@google.com> 1569057289 -0700

[automerger skipped] Merge "Add log metrics for Aware Display Settings" into qt-qpr1-dev am: 2ee661e584
am: 9423025444 -s ours
am skip reason: change_id I5b96a3a04a1d2c1ba01b9ec1f707dec040a331c3 with SHA1 d3939b932e is in history

Change-Id: I5126f42b67ea6982fa0673fde1928e05261a9835