OSDN Git Service

Merge commit \'98691c26ecdaf8689739966b1aeeaa54f3fd1eb2\' into manual_merge_98691c2...
authorAjay Panicker <apanicke@google.com>
Fri, 6 May 2016 23:58:15 +0000 (23:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 May 2016 23:58:15 +0000 (23:58 +0000)
commit68c5f8c3e812f9f2053ac597b66b9eca94d508b0
tree7d07f1f8b5db883ecbc6b13a40716196122cfea7
parent33033f9df7a4966c4de2ba1f5e380e047a7f57cc
parent6cf5d900582c7ac2379694a80064ecf162097914
Merge commit \'98691c26ecdaf8689739966b1aeeaa54f3fd1eb2\' into manual_merge_98691c2 am: e308ed5889
am: 6cf5d90058

* commit '6cf5d900582c7ac2379694a80064ecf162097914':
  Add protection against LE scanning abuse

Change-Id: I2af6f78d09648a45f6b9ce8020bf14a7fbf35a5e