tree d8089076c7f5f7046245a2eab92b92891d7b11b8
parent dc5ad0b6e6eef258296001c58117e401d5aaa315
parent 20fcc2eb4c3923930ebbf63e027dc0abb011820e
author Mathew Inwood <mathewi@google.com> 1533227955 +0100
committer Mathew Inwood <mathewi@google.com> 1533227983 +0100

resolve merge conflicts of 20fcc2eb4c3923930ebbf63e027dc0abb011820e to stage-aosp-master

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I9437532ae617eda28aa5ae796563e985cc0ddbca
Change-Id: Ifa50d21fb63b7ac73ab2ddaeebb1e01f535595c7