tree d2ac40334ea6c85e203a02e9782da9d9e539ede0
parent 7ff52c9212b5e73acb929b521ca4b17c59fc81a4
parent d42041fe96b465df5d7ddc233d35be0eddd23896
author Sooraj Sasindran <sasindran@google.com> 1548794283 -0800
committer android-build-merger <android-build-merger@google.com> 1548794283 -0800

[automerger skipped] Merge "Define more thresholds for opportunistic data" am: cf2e069962 am: c3bf9392ac
am: d42041fe96 -s ours
am skip reason: change_id Ie7c35e10aeaf791dba49d9f5e881d292068f81f3 with SHA1 73710f8ca6 is in history

Change-Id: I141d3a7d29ba2c7d64dd232097285cefb5cc9f24