[automerger skipped] RESTRICT AUTOMERGE: Relax composite-to-present latency requirement
authorChris Forbes <chrisforbes@google.com>
Fri, 26 Oct 2018 21:48:24 +0000 (14:48 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Oct 2018 21:48:24 +0000 (14:48 -0700)
am: 2b6581ff37  -s ours

Change-Id: I67b1715bd1c85f8ab2199a5e9e4fba67693279fd


Trivial merge