tree 6fd3e6e81d932fd567a2a7a5139317f064274f0f
parent 769fde07186a2e1e54b575a3ef9f07609e85bfaa
parent cb95d040fcfd2e7f910bd36df590ad190adc8676
author Lucas Dupin <dupin@google.com> 1568830467 -0700
committer android-build-merger <android-build-merger@google.com> 1568830467 -0700

Merge "Avoid going to SHADE_LOCKED when already in SHADE" into qt-qpr1-dev am: 01047d0372
am: cb95d040fc

Change-Id: I7f0d670450eba65b174983907dfd7d70c12a3060