diff options
author | Xiangyu/Malcolm Chen <refuhoo@google.com> | 2019-11-05 14:08:33 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-11-05 14:08:33 -0800 |
commit | 3b1c38ad2f3ee755f032f530747c0aef34184a0a (patch) | |
tree | c0dfe0e3085ec927e7fa142d5d07a9aa98fac59a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d5acc4c0f7bb17edea9c55ab1aa6598718ae05af (diff) | |
parent | 94a58bd978e5b851c3f6dbe8ea0846d5bf46ee19 (diff) |
[automerger skipped] Merge "Add a carrier config to specify validation timeout for data switch." into qt-qpr1-dev
am: 94a58bd978 -s ours
am skip reason: change_id Id8dc2da05efdf4dd53d03b133cc9f47efd196e02 with SHA1 448b51d41d is in history
Change-Id: I8a6b3a61a165d4ca5986dc297926de9afe32380b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions