| commit | 80b343c73b22c7d784973e04d38b8db235f0b185 | [log] [tgz] |
|---|---|---|
| author | Edgar Wang <edgarwang@google.com> | Tue May 21 18:28:33 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 21 18:28:33 2019 -0700 |
| tree | a63cf492492dad7922565487c41ec11aacb46adf | |
| parent | 93891cf6fbb26cd281d1d8e751b9827a25ebb92b [diff] | |
| parent | b55ccb8baa6340e083c982f75831ac752b35e999 [diff] |
Merge "Merge "Add Aware Lock Settings" into qt-dev am: a491cc4cd0 am: f2692ee338" into qt-r1-dev-plus-aosp am: b55ccb8baa Change-Id: I4fd6e226baa972ffde741d4bcb84f376e0277d31