Ajay Panicker 779a1f096c Merge "Protect various Bluetooth broadcasts" ...

am: 53ff75bb68

Change-Id: Id4f77ea2092f9a04397fe596ed92f2f30a3235df

2016-08-18 22:32:09 +00:00

..

java

resolve merge conflicts of c76a3ac to stage-aosp-master

2016-08-17 13:28:04 -07:00

jni

Merge "Remove unused includes."

2016-08-18 03:22:39 +00:00

res

Merge "Protect various Bluetooth broadcasts"

2016-08-18 22:32:09 +00:00

tests

Merge "Tidy up MockWebServer usage"

2016-08-09 16:16:54 +00:00