commit | 9ea42174308556341c49ed47c803eb11f3e44b80 | [log] [tgz] |
---|---|---|
author | Steve Elliott <steell@google.com> | Thu Nov 21 09:48:37 2019 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Thu Nov 21 09:48:37 2019 -0800 |
tree | 77695280646ade632e2ebbf72c621622d5ae3e5c | |
parent | a51da7900bf6cfa9242053eddef38af16a4e20d0 [diff] | |
parent | 3d0216caa5a8b73bc9099bd4e8d21b367eee97de [diff] |
[automerger skipped] Merge "DO NOT MERGE: Properly reflect device lock state in Global Action panel." into qt-qpr1-dev am: 893a2b05a5 am: 3d0216caa5 -s ours am skip reason: subject contains skip directive Change-Id: I0d3dedbffeaf6d21228f69297e63afb785af7160