diff options
| author | Jovana Knezevic <jovanak@google.com> | 2019-06-12 11:50:05 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-12 11:50:05 -0700 |
| commit | 02751acf5f71b0dbe5de0e80bbc683814345a274 (patch) | |
| tree | 12d69c347c1bfc0e41d109d37aceeaf3d76892e4 /opengl/java/android/opengl/Material.java | |
| parent | be9b13765aa37af8e4b1f366168bd6d0b1cd8066 (diff) | |
| parent | 63a13d1e56c53fa7964a1b317264e7fc71b80032 (diff) | |
Merge "Merge "Preventing keyguard dismissal when screen is off." into qt-dev am: ffd598557d am: c5e38fb989" into qt-r1-dev-plus-aosp
am: 63a13d1e56
Change-Id: I6da14373a6fcf9ba3232ac2099d588ee957d0cff
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions