diff options
| author | Nancy Zheng <nzheng@google.com> | 2017-01-23 21:32:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-23 21:32:28 +0000 |
| commit | 20d79203be49ad3140ef5ad4f5be7018cc249a05 (patch) | |
| tree | 098bf5c10974112a148645e2ea07750e4d6bd7cd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 11bdbd114582d0dec39fc0e767326f2ae1a1161a (diff) | |
| parent | 8ac1bff7e23ac984568652e1c5e9ffc7dd47e341 (diff) | |
Merge "Query for the settings package in KeyguardManager instead of hardcoding it." into cw-f-dev
am: 8ac1bff7e2
Change-Id: I2e4f9b4ea73ff5d0491b8cfda889a57aaac413ff
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions