tree a56623e43ecdef77c6e0ea98f35112ffefbee4da
parent d6f00d85115a5c6a887f29b731cc8aa653996cc7
parent f8d22dec8788d18c5b37adf3b4710691d5d347ed
author David Brazdil <dbrazdil@google.com> 1531312418 -0700
committer android-build-merger <android-build-merger@google.com> 1531312418 -0700

resolve merge conflicts of 6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10 to stage-aosp-master
am: f8d22dec87

Change-Id: Ia11c6556d55a1eab3552edcd8665969001cfb9e7