diff options
| author | Jovana Knezevic <jovanak@google.com> | 2019-06-12 11:46:21 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-12 11:46:21 -0700 |
| commit | 3af96c137b5f72f1f368451d897c9f93ff0f8750 (patch) | |
| tree | 698fb3b56a4b36f591d5ccf587c2707725af31cf /opengl/java/android/opengl/Material.java | |
| parent | 4017d4ffdb7b62c9bc200644cd4a4fd098237b18 (diff) | |
| parent | 696678791eda3eb0e6f895d7e4e1a72b28671715 (diff) | |
Merge "Merge "Preventing keyguard dismissal when screen is off." into qt-dev am: ffd598557d am: dec891e9a9" into qt-r1-dev-plus-aosp
am: 696678791e
Change-Id: I0b81667b9419ae23b47dddc2b08649ced1e59b06
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions