tree ec2bcbc1a012ab08c711cd81b40f2d067c8694a9
parent b57dfe26cfb1dc5eae20653d6490464d977c07bc
parent 5e1d95b0cc05eb1a6bf25a13223601f2e8f8fccb
author Neil Fuller <nfuller@google.com> 1528809253 +0100
committer Neil Fuller <nfuller@google.com> 1528809831 +0100

resolve merge conflicts of 5e1d95b0cc05eb1a6bf25a13223601f2e8f8fccb to stage-aosp-master

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic5527b29cbe8c84d2053be849cf09df5341e4790