Merge "Fix BandMode Dialog Crash on Open due to Style" am: 7588ef1518 am: 7aacdc2c13

author Nathan Harold <nharold@google.com>

Tue, 8 Jan 2019 01:50:20 +0000 (17:50 -0800)

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

Tue, 8 Jan 2019 01:50:20 +0000 (17:50 -0800)
author Nathan Harold <nharold@google.com>
Tue, 8 Jan 2019 01:50:20 +0000 (17:50 -0800)
committer android-build-merger <android-build-merger@google.com>
Tue, 8 Jan 2019 01:50:20 +0000 (17:50 -0800)
diff --cc AndroidManifest.xml
Simple merge
diff --cc src/com/android/settings/BandMode.java
Simple merge
author	Nathan Harold <nharold@google.com>
	Tue, 8 Jan 2019 01:50:20 +0000 (17:50 -0800)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 8 Jan 2019 01:50:20 +0000 (17:50 -0800)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/BandMode.java	patch \|	diff1 \|	diff2 \|	blob \| history