diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-09-11 01:50:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-09-11 01:50:35 +0000 |
| commit | b886478a11faa1161fadc572ea00fab433301f4b (patch) | |
| tree | b247a033767d0726d05544429acd576c6a8bb468 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 261928287876fbf659361465fcf8504633fa68cd (diff) | |
| parent | 6ba7f7bc179ae39d0a7598981132575904bbf96c (diff) | |
Merge "[automerger skipped] Merge "Set default phonebook access to ACCESS_REJECTED when user didn't choose one" into pi-dev am: 20d46e4bf1 -s ours am: a36fc3bb2c -s ours am: 8c17cb7e3d -s ours am: 8d11b8f9e1 -s ours am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1 efdcff2452 is in history" into qt-qpr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions