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