Merge "Merge commit '4626db5' into master_merge" into mnc-dev

author Prerepa Viswanadham <dham@google.com>

Tue, 5 May 2015 01:05:57 +0000 (01:05 +0000)

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

Tue, 5 May 2015 01:07:14 +0000 (01:07 +0000)
author Prerepa Viswanadham <dham@google.com>
Tue, 5 May 2015 01:05:57 +0000 (01:05 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 5 May 2015 01:07:14 +0000 (01:07 +0000)
diff --cc src/com/android/bluetooth/gatt/ScanManager.java
Simple merge
author	Prerepa Viswanadham <dham@google.com>
	Tue, 5 May 2015 01:05:57 +0000 (01:05 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 5 May 2015 01:07:14 +0000 (01:07 +0000)