diff options
author | Sudheer Shanka <sudheersai@google.com> | 2017-05-04 00:35:03 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-04 00:35:03 +0000 |
commit | a2ebd80d84e2ec240c51b2cba613dae8917452c9 (patch) | |
tree | 55e1dd660f5119a3d712d0abfdd43ee7ce50d613 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 257a070939f7b8d8fa8c1554db47d8fbb2da994c (diff) | |
parent | f345a436be4fcad491c39a29598854e7079f5e2b (diff) |
Merge "Reduce the timeout for waiting for the network state update." into oc-dev
am: f345a436be
Change-Id: I62dcd82ec7dc1ef4b3fb9ab2c332f18581b7425d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions