diff options
author | Zongheng Wang <wangzongheng@google.com> | 2019-09-10 18:49:57 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-10 18:49:57 -0700 |
commit | 6ba7f7bc179ae39d0a7598981132575904bbf96c (patch) | |
tree | b247a033767d0726d05544429acd576c6a8bb468 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 2f6ccca42590658affe7df0a609ec7f1722e772f (diff) | |
parent | 8d11b8f9e1a9a15c317eb8d91f66ca84d2bf6e5b (diff) |
[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
Change-Id: Id29733c3ca14165a3f6327ca4045992766757421
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions