Merge commit 'eba66c3' into master_merge

author Prerepa Viswanadham <dham@google.com>

Fri, 1 May 2015 17:10:22 +0000 (10:10 -0700)

committer Prerepa Viswanadham <dham@google.com>

Fri, 1 May 2015 17:10:22 +0000 (10:10 -0700)
author Prerepa Viswanadham <dham@google.com>
Fri, 1 May 2015 17:10:22 +0000 (10:10 -0700)
committer Prerepa Viswanadham <dham@google.com>
Fri, 1 May 2015 17:10:22 +0000 (10:10 -0700)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc core/java/android/bluetooth/le/ScanSettings.java
Simple merge
author	Prerepa Viswanadham <dham@google.com>
	Fri, 1 May 2015 17:10:22 +0000 (10:10 -0700)
committer	Prerepa Viswanadham <dham@google.com>
	Fri, 1 May 2015 17:10:22 +0000 (10:10 -0700)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/bluetooth/le/ScanSettings.java	patch \|	diff1 \|	diff2 \|	blob \| history