tree b937e871833956b6bdb799e0934c2aeb2c10d13b
parent 6a403d8d5b326762711b6fb0c131376ae00a01e3
parent d63c1209ed5409155fc4daa109edde3ac3c4a37f
author Stanley Tng <stng@google.com> 1534883297 -0700
committer android-build-merger <android-build-merger@google.com> 1534883297 -0700

Merge "Add note for FLAG_CANCEL_CURRENT when stopping scan" am: 041eb388de
am: d63c1209ed

Change-Id: Ib478500a29875f6a1bedac00add19c37f979e55d