diff options
author | Jorim Jaggi <jjaggi@google.com> | 2017-05-10 14:06:49 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-10 14:06:49 +0000 |
commit | 6970d4707a2d4e6e1c161904576f877a67b7a75d (patch) | |
tree | 2617f1ff16d2a094cbb16427be60a146bff0a8d5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 6d886dbb9c9abd1617ba42e74081ad252537d023 (diff) | |
parent | a8c27fb789f466215cf6fa77ef4815dc1bb44764 (diff) |
Merge "Merge "Make sure to notify client after Keyguard has been dismissed" into oc-dev am: 56b747fbac" into oc-dev-plus-aosp
am: a8c27fb789
Change-Id: Ibc824567df259b357d8d8e02645f3ece4797caf1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions