diff options
| author | Felipe Leme <felipeal@google.com> | 2019-08-13 16:00:31 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-13 16:00:31 -0700 |
| commit | c87412fd1aa76252c639c6bed68a41394a89f254 (patch) | |
| tree | eb0e4ab79f0a4105aba8655f117e4f2db66ade02 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bd5453c2794dcc10ab72ee2b9345e12adf23425d (diff) | |
| parent | b27cd42b1a3f5e393a50f3c579960fbcaf0c9769 (diff) | |
[automerger skipped] Merge "Don't start intelligence services that are not provided by the OEM." into qt-qpr1-dev am: 4e8070890a
am: b27cd42b1a -s ours
am skip reason: change_id I07f9873a7ad0c6dd1c1a0d6a0e5e05681bfc67fc with SHA1 c6fff2524b is in history
Change-Id: I7c919bf1bc1720e44487ca87cb83786ca2a109d8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions