tree 5d7bb2176580bacee45bde5aea057bc6411803c3
parent cc8763c1575582abc2e0ebea888031af20f9d6ad
parent 4b0748ffda489940bd4c5e275f83c3540ed0e60a
author Vinay Kalia <vinaykalia@google.com> 1504902397 +0000
committer android-build-merger <android-build-merger@google.com> 1504902397 +0000

Merge "Update ScanSettings documentation for scan modes" am: 8157ab2a0e am: be7ccdf6e9
am: 4b0748ffda

Change-Id: Icad06975358e4814a3f05a363a41a7a77511bd88