tree 288c864cfcfd405254702994875eaaac5a14363a
parent b8af792fdfc056ca3743fc98dd88cd19468e0df7
parent 7eb8b4cf7e4a333e4bb81ae576f7045a380594ac
author Elliott Hughes <enh@google.com> 1521249933 +0000
committer android-build-merger <android-build-merger@google.com> 1521249933 +0000

resolve merge conflicts of 0d55f34ed26f44e11c2ad93c0791e1b920778ba0 to pi-dev-plus-aosp
am: 7eb8b4cf7e

Change-Id: Icf5bae5cd4e4e114d7fcb0ee2a9539e9e36678f6