tree 1a1a2ac4ec09a442d27bd7725347ae53c857e911
parent 30c5ae43fa590b0f0afa598081b30d3a236f1654
parent 1b13c5e03d9005018784383e65e74089cbef47ce
author David Gross <dgross@google.com> 1530554255 -0700
committer android-build-merger <android-build-merger@google.com> 1530554255 -0700

Merge "Fix for HDRNet producing nondeterministic results." am: d6d227a99f
am: 1b13c5e03d

Change-Id: Ie86bc94d8e371e824e8584718a8ac9aefae6982f