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

Change-Id: I0ff93a883aa47511d94e67dc10db54899e1a1951


Trivial merge