Merge "Update Multi-OffHost related API definition" into qt-dev

author Jack Yu <jackcwyu@google.com>

Thu, 18 Apr 2019 14:34:28 +0000 (14:34 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 18 Apr 2019 14:34:28 +0000 (14:34 +0000)
author Jack Yu <jackcwyu@google.com>
Thu, 18 Apr 2019 14:34:28 +0000 (14:34 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 18 Apr 2019 14:34:28 +0000 (14:34 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/res/res/values/attrs.xml
Simple merge
author	Jack Yu <jackcwyu@google.com>
	Thu, 18 Apr 2019 14:34:28 +0000 (14:34 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 18 Apr 2019 14:34:28 +0000 (14:34 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/attrs.xml	patch \|	diff1 \|	diff2 \|	blob \| history