diff options
| author | Greg Plesur <plesur@google.com> | 2016-11-03 20:30:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-03 20:30:59 +0000 |
| commit | 0cbe2e1a5c8c708054ea37588f3bb7b91089e604 (patch) | |
| tree | 830f09f1aec2643a9b9cbb4a50786772b2d9bd73 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e44736a819b342db0787950ab4e0800dbf01c0f1 (diff) | |
| parent | c447d9ef6a6932f6abdddc3aa6e59cf92792372b (diff) | |
Merge "New Wear devices need to update their DISABLE_LOCKSCREEN_KEY." into cw-f-dev am: 343dbac2e0
am: c447d9ef6a
Change-Id: I17a831ab2c537c00452f250d151ec3f63b2d6277
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions