tree 9fffd28a5efe30067c440dc1ba031704e583209d
parent 487ca863a0f076c272751ebf2acdc4926ed9faa8
parent c247b8bc2a8555bf25ff2ca717765117ae2d5ca6
author David Brazdil <dbrazdil@google.com> 1533582421 -0700
committer android-build-merger <android-build-merger@google.com> 1533582421 -0700

resolve merge conflicts of 627a84c26a84493ec675360b0aba56cde61e1482 to stage-dr1-aosp-master
am: c247b8bc2a

Change-Id: I89d10bc50989ee97e3407a9d3bbe2ef93b52fd42