tree e63d3d6f962528682f314d7ce2a6d752ba38039b
parent 2f9218d0c9784d5831a57e45c841e4367d6960a5
parent ca48eb7fa94521f4f83c3f93b6ce884b91bc3b22
author Neil Fuller <nfuller@google.com> 1530101418 -0700
committer android-build-merger <android-build-merger@google.com> 1530101418 -0700

resolve merge conflicts of bc38909bf3790331532c329a867d5a22fbf94016 to stage-aosp-master
am: ca48eb7fa9

Change-Id: I350bcde63f1874d4a237e81d7f93bed00cbba6a3