TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-15 07:06:11 -04:00
Code Issues Packages Projects Releases Wiki Activity
210 Commits 14 Branches 26 Tags
b588cb34b4f9f901ba0e7b7eb2a72bd3375be72c
Commit Graph
53 Commits
Author SHA1 Message Date
hai007 b588cb34b4 Merge branch 'google3' to roll forward up to cl/351408510. 2021-01-12 11:20:06 -08:00
hai007 0be1cd03ce Roll forward up to cl/351408510. 2021-01-12 11:16:21 -08:00
edwinwutw 085907fea9 Merge branch 'google3' to roll forward to cl/350492846. 2021-01-08 01:01:41 +08:00
edwinwutw f93ad3beb1 Roll forward to cl/350492846 
Signed-off-by: edwinwutw <edwinwutw@gmail.com>
 2021-01-08 01:00:39 +08:00
hai007 f7c364f80a Merge branch 'master' into release to roll forward to cl/348050035. 2020-12-17 10:47:24 -08:00
hai007 da4ff6c88f Merge branch 'google3' to roll forward to cl/348050035. 2020-12-17 10:45:20 -08:00
hai007 cebf022b28 Roll forward to cl/348050035. 2020-12-17 10:44:17 -08:00
hai007 607071556c Merge branch 'master' into release to roll forward to cl/347045028. 2020-12-11 11:58:47 -08:00
hai007 0335b4f4d1 Merge branch 'google3' to roll forward to cl/347045028. 2020-12-11 11:57:49 -08:00
hai007 599a015760 Roll forward to cl/347045028 
Signed-off-by: hai007 <hais@google.com>
 2020-12-11 11:56:14 -08:00
hai007 345665efb1 Merge branch 'master' into release to roll forward to cl/345608764. 2020-12-03 22:43:52 -08:00
hai007 57d739831b Merge branch 'google3' to roll forward to cl/345608764. 2020-12-03 22:39:36 -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 3b0b580dd8 Merge branch 'master' into release to roll forward to cl/343785060. 2020-11-23 23:16:34 -08:00
hai007 106524c279 Merge branch 'google3' to roll forward to cl/343785060. 2020-11-23 23:12:46 -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 a3ff2b3cf4 Merge branch 'google3' to roll forward to cl/343180341. 2020-11-18 16:29:40 -08:00
hai007 25bf896257 Roll forward to cl/343180341. 2020-11-18 16:28:10 -08:00
hai007 63449204f9 Merge branch 'master' into release to roll forward to cl/341966255. 2020-11-11 22:28:18 -08:00
hai007 83c1892d3b Merge branch 'google3' to roll forward to cl/341966255. 2020-11-11 20:48:27 -08:00
hai007 a00ffc5e0d Roll forward to cl/341966255 
Signed-off-by: hai007 <hais@google.com>
 2020-11-11 20:47:55 -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 6b6c83df0e Merge branch 'google3' to roll forward to cl/341113126. 2020-11-06 13:56:56 -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 32a9b001d9 Merge branch 'google3' to roll forward to cl/340537221. 2020-11-03 15:30:12 -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 e7e473b763 Roll forward to cl/333580336 
Signed-off-by: Josh Nohle <nohle@google.com>
 2020-09-24 14:01:28 -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 a0651b817a Merge branch 'google3' 
Change-Id: I019ed6ec4eb0539d364af44dcc27587914131b47
 2020-09-03 02:11:01 -07:00
Alexey Polyudov d5bed12d40 Roll forward to cl/329875420 
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I50e284b30472160a409829957b2cb3926babfede
 2020-09-03 02:09:56 -07:00
Himanshu Jaju 59cd56ec82 Change smhasher path 
Changes the smhasher path to "smhasher/src/file" from "smhasher/file"
for easier import in Chromium land.

Change-Id: Ide6aa844fd8f37c9100e89d6a0bcb945b0860227
 2020-07-07 12:46:30 -07:00
Alexey Polyudov 412273d317 Merge branch 'google3' 
Change-Id: I2c5f890e76873090819e7569b214af829bfd0daf
 2020-06-24 10:57:51 -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 271a449d7a Prepare Project for open source 
Change-Id: Ic26d4915efa2be47ce00ffaab7a474d696e6657c
 2020-05-04 13:13:13 -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 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