Merge "Make migrate option menu invisible when src volume is not mounted" am: 6db9f21...

author Fan Zhang <zhfan@google.com>

Tue, 4 Dec 2018 18:15:02 +0000 (10:15 -0800)

committer android-build-merger <android-build-merger@google.com>

Tue, 4 Dec 2018 18:15:02 +0000 (10:15 -0800)
author Fan Zhang <zhfan@google.com>
Tue, 4 Dec 2018 18:15:02 +0000 (10:15 -0800)
committer android-build-merger <android-build-merger@google.com>
Tue, 4 Dec 2018 18:15:02 +0000 (10:15 -0800)
diff --cc src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java
Simple merge
diff --cc src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
Simple merge
diff --cc tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java
Simple merge
author	Fan Zhang <zhfan@google.com>
	Tue, 4 Dec 2018 18:15:02 +0000 (10:15 -0800)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 4 Dec 2018 18:15:02 +0000 (10:15 -0800)
		1	2
src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/deviceinfo/PrivateVolumeSettings.java	patch \|	diff1 \|	diff2 \|	blob \| history
tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java	patch \|	diff1 \|	diff2 \|	blob \| history