Merge "Volume slider content description" into oc-mr1-dev

author Lucas Dupin <dupin@google.com>

Tue, 1 Aug 2017 20:49:39 +0000 (20:49 +0000)

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

Tue, 1 Aug 2017 20:49:39 +0000 (20:49 +0000)
author Lucas Dupin <dupin@google.com>
Tue, 1 Aug 2017 20:49:39 +0000 (20:49 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 1 Aug 2017 20:49:39 +0000 (20:49 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
Simple merge
author	Lucas Dupin <dupin@google.com>
	Tue, 1 Aug 2017 20:49:39 +0000 (20:49 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 1 Aug 2017 20:49:39 +0000 (20:49 +0000)