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