| commit | 871cebfeb3b5217cdeefadd486e1acd0088b0fb5 | [log] [tgz] |
|---|---|---|
| author | Ajay Panicker <apanicke@google.com> | Fri May 06 23:58:15 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 06 23:58:15 2016 +0000 |
| tree | b1a7bbec830eb5b4b4e6472b2ac58a630fada41c | |
| parent | ca7ca1f63a6f49ba5b41c0c74797d006abd334fc [diff] | |
| parent | 22477a83996779dcc4aeb06c852fb42e42f485a4 [diff] |
Merge commit \'49bf70e7dd9bcc52f8e7247dc684f5d747222c2d\' into manual_merge_98691c2 am: 9cc2a5d7b5 am: 22477a8399 * commit '22477a83996779dcc4aeb06c852fb42e42f485a4': Add protection against LE scanning abuse Change-Id: I2af6f78d09648a45f6b9ce8020bf14a7fbf35a5e