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
This commit is contained in:
Alexey Polyudov
2020-06-04 18:08:45 +00:00
88 changed files with 3810 additions and 683 deletions
+1 -1
View File
@@ -7,7 +7,7 @@
#include "core/status.h"
#include "platform/api/platform.h"
#include "platform/byte_array.h"
#include "platform/file_impl.h"
#include "platform/impl/shared/file_impl.h"
#include "platform/impl/shared/sample/sample_wifi_medium.h"
#include "platform/port/string.h"
#include "platform/ptr.h"