Commit Graph
9 Commits
Author SHA1 Message Date
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
Himanshu Jaju cffbc04508 Roll forward to cl/314549634
Change-Id: I4d1e7eacd5fa4078a094571ad6d5f51e422535ff
2020-06-03 11:18:32 -07:00
Alexey Polyudov 91e925c873 Merge branch 'google3'
Change-Id: Ibebf84b98939ee8e5006beedc34d225e8c2dd413
2020-05-28 01:36:50 -07:00
Alexey Polyudov ae1c427b99 nearby: snapshot of cl/313536507
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I8936b527079074d5c3af5531b9245063767cc4a7
2020-05-28 00:03:22 -07:00
Alexey Polyudov fef714be4e Update build scripts
Change-Id: I52f7a35324c6be29d7e80d5cc0e6084b49bcc0eb
2020-04-06 10:19:13 -07:00
Alexey Polyudov 81a6d31778 Merge branch 'google3'
Change-Id: I8511d14d8173f661fc79cf0ad6ed3e8700efdbd4
2020-04-04 12:56:13 -07:00
Alexey Polyudov 7466db88c0 Add CMake support
Change-Id: I716e1fa3ec43bfe57326f5a691131505f84b7832
2020-04-04 12:55:01 -07:00
Alexey Polyudov d455926d89 nearby: snapshot of cl/304428753
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I0023ac6e40456fc4a8169c3173bcbff3b5ccc476
2020-04-04 12:54:05 -07:00
Alexey Polyudov 204f76077d nearby: snapshot as of cl/296436629
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I2cf5bf225b76f4c1541954651f3a7544a14e0cec
2020-04-04 12:52:31 -07:00