Merge "Hide stretch mode from PlaybackSettings"

author Andy Hung <hunga@google.com>

Sat, 25 Apr 2015 01:28:41 +0000 (01:28 +0000)

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

Sat, 25 Apr 2015 01:28:47 +0000 (01:28 +0000)
author Andy Hung <hunga@google.com>
Sat, 25 Apr 2015 01:28:41 +0000 (01:28 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 25 Apr 2015 01:28:47 +0000 (01:28 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc media/java/android/media/AudioTrack.java
Simple merge
author	Andy Hung <hunga@google.com>
	Sat, 25 Apr 2015 01:28:41 +0000 (01:28 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 25 Apr 2015 01:28:47 +0000 (01:28 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
media/java/android/media/AudioTrack.java	patch \|	diff1 \|	diff2 \|	blob \| history