Commit Graph
25 Commits
Author SHA1 Message Date
hai007 3b0b580dd8 Merge branch 'master' into release to roll forward to cl/343785060. 2020-11-23 23:16:34 -08:00
hai007 e6d52359cf Roll forward to cl/343785060
Signed-off-by: hai007 <hais@google.com>
2020-11-23 22:28:06 -08:00
hai007 511dba89de Merge branch 'master' into release to roll forward to cl/341113126. 2020-11-06 13:58:02 -08:00
hai007 67f5942051 Roll forward to cl/341113126
Signed-off-by: hai007 <hais@google.com>
2020-11-06 13:55:36 -08:00
hai007 e9d873b14a Merge branch 'master' into release to roll forward to cl/340537221. 2020-11-03 15:31:02 -08:00
hai007 75a951665f Roll forward to cl/340537221
Signed-off-by: hai007 <hais@google.com>
2020-11-03 15:29:35 -08:00
hai007 d3b3d07805 Roll forward to cl/338725629
Signed-off-by: hai007 <hais@google.com>
2020-10-23 12:43:22 -07:00
Alexey Polyudov b724d792dd OSS Fixes
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I9a7d3c3d9790dc58c0d4c2bd2134499337b9a17b
2020-10-22 11:25:32 -07:00
Alexey Polyudov db71c4c13d Merge branch 'google3'
Change-Id: I674779bb692da84fd8718bb59ffa3eecf9011a3f
2020-10-22 11:07:51 -07:00
Alexey Polyudov 2155b3ddeb Roll forward to cl/338482889
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I9850950db8bd84f0904ea1a413151887f52098cf
2020-10-22 10:47:34 -07:00
Josh Nohle 0391f99b13 Merge branch 'google3' 2020-09-24 13:58:18 -07:00
Josh Nohle 2400a0aa4c Roll forward to cl/333580336
Signed-off-by: Josh Nohle <nohle@google.com>
2020-09-24 13:57:15 -07:00
Alexey Polyudov 2994e4f134 Merge branch 'google3'
Change-Id: Ib74e01d47d15deb01314cacd8f67815515d7a31a
2020-08-25 11:32:00 -07:00
Alexey Polyudov c673bf6ac0 Roll forward to cl/328359974
Change-Id: If2b57ecc852aecf7dea454648f485fd7c08e72a9
2020-08-25 11:27:27 -07:00
Alexey Polyudov 07c6fcbdf0 Merge branch 'google3'
Change-Id: Ic0929c69225dba30ae0aa9bec2d5ce155fd927c0
2020-06-30 00:28:19 -07:00
Alexey Polyudov 5142ef11af Roll forward to cl/318932159
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: Ia0cddfc8cf46c66d5739bdb45ab7825422912082
2020-06-30 00:27:57 -07:00
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