tree 754d4fa04c6b1ed2f7f824c5d3b2616f1a6e9422
parent 36c8efe58ce8b67f31a9089407179ac7c5b36611
parent ef3763a9cb39b0d6efe1c5a05757da139bd5294d
author Ajay Panicker <apanicke@google.com> 1496175171 +0000
committer android-build-merger <android-build-merger@google.com> 1496175171 +0000

Merge "Switch GATT scan timekeeping to use a different clock" am: fd12816a6e am: beb868d127
am: ef3763a9cb

Change-Id: Id5e1030853d62ac095da7afc3968bd16ca9aa6c4