diff options
| author | Selim Cinek <cinek@google.com> | 2019-06-12 13:18:21 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-12 13:18:21 -0700 |
| commit | e6b33f7ec0d6b9b684039f54de63e8b9463afc1a (patch) | |
| tree | db2e40009a0c0ff2c3444b15dda5df17baf99d60 /opengl/java/android/opengl/Material.java | |
| parent | dea0ef9e61155165726b8c63a662f0bdc6039658 (diff) | |
| parent | d3455f19ff28e87abe13bbe60a905cee76f0765a (diff) | |
Merge "Not bypassing the lockscreen anymore when the user has pulled down" into qt-r1-dev am: 541c6d9e7e
am: d3455f19ff
Change-Id: Icc594ac57fa1faa0acb7bb67b2417d3d24cfe21f
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions