tree 679598c8da281455ecdf9345b80c91a323bca8bd
parent 436ddb1459b1ed3b251a5a27b5a50ffdeb4d080f
parent 0d55f34ed26f44e11c2ad93c0791e1b920778ba0
author Elliott Hughes <enh@google.com> 1521236813 -0700
committer Elliott Hughes <enh@google.com> 1521236813 -0700

resolve merge conflicts of 0d55f34ed26f44e11c2ad93c0791e1b920778ba0 to pi-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ib6a4f0620f71ef9c1b2968a621c0ad383063c5f0