tree daa903ed31def3874d31de43b9ed298d54bef501
parent b2163911bd7f560680471955e0ba549af2bed80b
parent 89f6bb1fc383c037127d9f145ae2404efa051af3
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1536895806 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1536895806 +0000

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