tree 5df3ed4df7d9dd057e36dccffadf137450eb5acc
parent 1c287376918012f99081fd7d4900fceab36e1455
parent 597229d681ac1794e2b31ef9a2883337f5b652e2
author Mathew Inwood <mathewi@google.com> 1534840276 +0100
committer Mathew Inwood <mathewi@google.com> 1534840276 +0100

resolve merge conflicts of 597229d681ac1794e2b31ef9a2883337f5b652e2 to stage-aosp-master

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