Skip to content
Commit d10e384d authored by Andrew Solovay's avatar Andrew Solovay
Browse files

resolve merge conflicts of a3e34fe9 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
parents 5d82f62b a3e34fe9
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment