tree 5dd967adbe905b12fcbaa90c37d7d3e745fee5b9
parent 7b9fc027080815447225bccc74845e0b1e0fe2bc
parent 3f758d8e02385270c4b8f940015398a039f45f17
author Stanley Tng <stng@google.com> 1536895785 -0700
committer android-build-merger <android-build-merger@google.com> 1536895785 -0700

Merge "Add note for FLAG_CANCEL_CURRENT when stopping scan" into pi-dev am: 3667b71225
am: 3f758d8e02

Change-Id: I807d66b5df30dc705b64c0a9e6f6feb66a36c4cd