 hai007
|
133dddeccb
|
Merge branch 'google3' to master, roll forward up to cl/355302206.
|
2021-02-04 13:34:05 -08:00 |
|
|
hai007
|
48e1c47a93
|
Roll forward up to cl/355302206.
|
2021-02-04 13:32:13 -08:00 |
|
|
hai007
|
63b786e7e7
|
Merge branch 'google3' to roll forward up to cl/355211070.
|
2021-02-02 11:24:34 -08:00 |
|
|
hai007
|
8a3b5f2f65
|
Roll forward up to cl/355211070.
|
2021-02-02 11:23:25 -08:00 |
|
|
hai007
|
f51136b116
|
Merge branch 'google3' to roll forward up to cl/354394201.
|
2021-01-28 14:29:26 -08:00 |
|
|
hai007
|
266190b517
|
Roll forward up to cl/354394201.
|
2021-01-28 14:27:14 -08:00 |
|
|
hai007
|
39d141ad73
|
Merge branch 'google3' to roll forward up to cl/353292511.
|
2021-01-22 12:15:03 -08:00 |
|
|
hai007
|
335b3a8d45
|
Roll forward up to cl/353292511.
|
2021-01-22 12:13:44 -08:00 |
|
|
hai007
|
f7c364f80a
|
Merge branch 'master' into release to roll forward to cl/348050035.
|
2020-12-17 10:47:24 -08:00 |
|
|
hai007
|
cebf022b28
|
Roll forward to cl/348050035.
|
2020-12-17 10:44:17 -08:00 |
|
|
hai007
|
345665efb1
|
Merge branch 'master' into release to roll forward to cl/345608764.
|
2020-12-03 22:43:52 -08:00 |
|
|
hai007
|
873548acaa
|
Roll forward to cl/345608764.
Signed-off-by: hai007 <hais@google.com>
|
2020-12-03 22:36:42 -08:00 |
|
|
hai007
|
c96d6d23c1
|
OSS fixes
Signed-off-by: hai007 <hais@google.com>
|
2020-11-23 23:17:58 -08:00 |
|
|
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
|
ec76d46f7a
|
Merge branch 'master' into release to roll forward to cl/343180341.
|
2020-11-18 16:30:45 -08:00 |
|
|
hai007
|
25bf896257
|
Roll forward to cl/343180341.
|
2020-11-18 16:28:10 -08:00 |
|
|
hai007
|
5935f3ae6a
|
Merge branch 'master' into release to roll forward to cl/342344386.
|
2020-11-13 15:20:05 -08:00 |
|
|
hai007
|
421dca8593
|
Roll forward to cl/342344386
Signed-off-by: hai007 <hais@google.com>
|
2020-11-13 15:10:03 -08:00 |
|
|
hai007
|
63449204f9
|
Merge branch 'master' into release to roll forward to cl/341966255.
|
2020-11-11 22:28:18 -08:00 |
|
|
hai007
|
2526d46eaf
|
patch cl/340877543
Signed-off-by: hai007 <hais@google.com>
|
2020-11-10 11:47:39 -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
|
db78660430
|
Merge branch 'master' into release to roll forward to cl/338725629.
|
2020-10-23 12:49:48 -07: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
|
e7e473b763
|
Roll forward to cl/333580336
Signed-off-by: Josh Nohle <nohle@google.com>
|
2020-09-24 14:01:28 -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 |
|
|
Josh Nohle
|
d4a3110624
|
Merge branch 'google3'
|
2020-09-24 13:19:01 -07:00 |
|
|
Josh Nohle
|
f53f38144d
|
Roll forward to cl/333580336
Signed-off-by: Josh Nohle <nohle@google.com>
|
2020-09-24 13:15:16 -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
|
6b27a508ed
|
nearby: snapshot of cl/317978613
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I4bf367877a986910bb03e1c54aa972b4bcd59942
|
2020-06-23 19:52:26 -07:00 |
|
|
Himanshu Jaju
|
e2a07376f4
|
Roll forward to cl/314747126
Change-Id: I858d3227b44ca6d727b39fae95358df58fce9c1b
|
2020-06-04 19:24:33 +01: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
|
5aaab9a4c0
|
Fix the build
Change-Id: Ied63786e8f73cec805123031c26886295f086691
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
|
2020-04-06 10:20:15 -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
|
18c09c5abe
|
Fix build and tests
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I3671e40fd0f8f028e3c8e46c4a47de0d2cc9aeff
|
2020-04-04 12:55:06 -07:00 |
|
|
Alexey Polyudov
|
7466db88c0
|
Add CMake support
Change-Id: I716e1fa3ec43bfe57326f5a691131505f84b7832
|
2020-04-04 12:55:01 -07:00 |
|