diff options
| author | Zongheng Wang <wangzongheng@google.com> | 2019-09-10 19:18:12 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-10 19:18:12 -0700 |
| commit | 5e57b72fe06c68a071d69a3466c7b76c9265e3dd (patch) | |
| tree | 38b550bdaf14917739c021f22abf9a589dff3224 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9dcdfe0328287045ad1aaa0726c46b8815e1d159 (diff) | |
| parent | 024d10103ae679e1990dbcbe107dbe5227a41ab6 (diff) | |
Merge "[automerger skipped] Set default phonebook access to ACCESS_REJECTED when user didn't choose one am: 02046b4f2c -s ours am: a6c49f091d -s ours am: 8a7c7cf04c -s ours am: eadf7dfa79 -s ours am: db68e70918 -s ours
am: 024d10103a -s ours
am skip reason: change_id Iefabeb731b941f09fe1272ac7b7cd2feba75c8df with SHA1 9b3cb0f06b is in history
Change-Id: I24fb7557ddae6c1dcf2d7517e785fbc50bed16df
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions