refs/heads/android10-qpr2-s4-release - platform/sdk

commit: d40ca99b08984704448e04c6672ab9169e7ce924
[log]
author: Xin Li <[email protected]>
Mon Feb 25 01:34:23 2019 -0800
committer: android-build-merger <[email protected]>
Mon Feb 25 01:34:23 2019 -0800
tree: 27fcc13cfa1c51779019fca53b64af3d62140d1f
parent: c4b527789b1c328ae88753226862451d8d6fe318 [diff]
parent: b6368bc7f92bf05e088040d13b3cb644f3a47303 [diff]

Merge stage-aosp-master into pi-dev-plus-aosp
am: b6368bc7f9

Change-Id: If2cbff6c6dc53a5e40f20067bdcb4b60febf49aa

tree: 27fcc13cfa1c51779019fca53b64af3d62140d1f