tree 677518664b57fee2443ab2996d6afc3de2b330f9
parent 5d82f62bdb75c28b87fd00598c8ac9f900ac81be
parent a3e34fe9fe4e2a8d0932e574721e5a8b94396c5e
author Andrew Solovay <asolovay@google.com> 1538690349 -0700
committer Andrew Solovay <asolovay@google.com> 1538693439 +0000

resolve merge conflicts of a3e34fe9fe4e2a8d0932e574721e5a8b94396c5e to pi-dev-plus-aosp

Bug: None
Test: Eyeballed (comment-only change).
Change-Id: Ia644cde66376b2bddeb27bb2a147b3266037aa2c
Exempt-From-Owner-Approval: Docs-only change
Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7