OSDN Git Service

Merge commit \'98691c26ecdaf8689739966b1aeeaa54f3fd1eb2\' into manual_merge_98691c2
authorAjay Panicker <apanicke@google.com>
Fri, 6 May 2016 23:53:16 +0000 (23:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 May 2016 23:53:16 +0000 (23:53 +0000)
commit6cf5d900582c7ac2379694a80064ecf162097914
tree90ee8469e786234bc15df4194f8f889251fb7e0b
parentb60af35039bb122a44e87bc9589f3f5e749678d8
parente308ed5889ddbc6b3fad2f4fd6f2a56ca83c9a2a
Merge commit \'98691c26ecdaf8689739966b1aeeaa54f3fd1eb2\' into manual_merge_98691c2
am: e308ed5889

* commit 'e308ed5889ddbc6b3fad2f4fd6f2a56ca83c9a2a':
  Add protection against LE scanning abuse

Change-Id: Iaf6b9f8668f30318b2256fb1eb239e5bcf92df34