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

..

g3

Merge branch 'google3'

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

ios

nearby: snapshot as of cl/296436629

2020-04-04 12:52:31 -07:00

sample

Merge branch 'google3'

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

shared

Merge branch 'google3'

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