diff options
author | Andrew Zeng <zenga@google.com> | 2017-04-14 20:03:20 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-04-14 20:03:20 +0000 |
commit | d210ce63d00aa76ec680781bcee08543cc839e66 (patch) | |
tree | 10e46789ac028565e3f8b93a581dd6ee51ff0092 /rs/java/android/renderscript/RenderScriptGL.java | |
parent | b16014169891509543ef229986a4559c1a185ffb (diff) | |
parent | 812594f5730165045774330d8d20ab9fbe6aef5b (diff) |
Merge "DO NOT MERGE Notify keyguard of when power button is pressed." into cw-f-dev am: 2c42db20e4 -s ours
am: 812594f573 -s ours
Change-Id: I54ee864eadfe657ab560c6490a23227532d96b0c
Diffstat (limited to 'rs/java/android/renderscript/RenderScriptGL.java')
0 files changed, 0 insertions, 0 deletions