diff options
| author | Zongheng Wang <wangzongheng@google.com> | 2019-09-10 18:58:43 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-10 18:58:43 -0700 |
| commit | 11bdce52d67f5e76772357b41b3dc7bfdef0e4f0 (patch) | |
| tree | 38b550bdaf14917739c021f22abf9a589dff3224 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5bb91279b4beee74d4d4d3cfdcc69e1da2c19b13 (diff) | |
| parent | 2f6ccca42590658affe7df0a609ec7f1722e772f (diff) | |
[automerger skipped] Merge "Merge "Set default phonebook access to ACCESS_REJECTED when user didn't choose one" into qt-dev am: 4e4b2875d5 am: 596b6f71b4 am: 4cbd91c71c" into qt-qpr1-dev-plus-aosp
am: 2f6ccca425 -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1 810c6d2117 is in history
Change-Id: If35a648602eb19f0fc6d7a85aef8556bdd941f88
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions