am 8b52f5f2: Merge "Suppress the warning compiled with gcc-4.9"

author Elliott Hughes <enh@google.com>

Fri, 19 Sep 2014 17:45:01 +0000 (17:45 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Fri, 19 Sep 2014 17:45:01 +0000 (17:45 +0000)
author Elliott Hughes <enh@google.com>
Fri, 19 Sep 2014 17:45:01 +0000 (17:45 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 19 Sep 2014 17:45:01 +0000 (17:45 +0000)
diff --cc stack/gatt/gatt_sr.c

index 2199794,9715686..eac00db

mode 100755,100644..100755
--- 1/stack/gatt/gatt_sr.c
--- 2/stack/gatt/gatt_sr.c
+++ b/stack/gatt/gatt_sr.c
author	Elliott Hughes <enh@google.com>
	Fri, 19 Sep 2014 17:45:01 +0000 (17:45 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 19 Sep 2014 17:45:01 +0000 (17:45 +0000)