Alexey Polyudov 841b92e943 Merge branch 'google3' ...

this is a merge commit based on a work done here:

https://team-review.git.corp.google.com/c/nearby-eng/nearby/+/761959

the difference with the former is: this one is tracking both heads of a merge

Change-Id: I8b28b1d3a5280581f20e4edf9144641a12df8879

2020-06-04 18:08:45 +00:00

..

core

Merge branch 'google3'

2020-06-04 18:08:45 +00:00

core_v2

Roll forward to cl/314549634

2020-06-03 11:18:32 -07:00

platform

Merge branch 'google3'

2020-06-04 18:08:45 +00:00

platform_v2

Merge branch 'google3'

2020-06-04 18:08:45 +00:00