TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-15 15:16:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
116 Commits 14 Branches 26 Tags
511dba89deef7ca278092a1535ff385833fc1dc3
Commit Graph
65 Commits
Author SHA1 Message Date
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 4e5f7d0179 Merge branch 'master' into release to roll forward to cl/340553187. 2020-11-03 17:08:21 -08:00
hai007 c3b9bc6757 Merge branch 'google3' to roll forward to cl/340553187. 2020-11-03 17:06:30 -08:00
hai007 3c698dabc5 Roll forward to cl/340553187 
Signed-off-by: hai007 <hais@google.com>
 2020-11-03 17:05:48 -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 47fd42c83c Merge branch 'master' into release to roll forward to cl/339936269. 2020-10-30 14:26:12 -07:00
hai007 9f6dfc2dc7 Merge branch 'google3' to roll forward to cl/339936269. 2020-10-30 14:11:09 -07:00
hai007 59a4f83de2 Roll forward to cl/339936269 
Signed-off-by: hai007 <hais@google.com>
 2020-10-30 14:10:14 -07:00
hai007 d8ebea6f68 OSS fixes 
Signed-off-by: hai007 <hais@google.com>
 2020-10-23 12:51:53 -07:00
hai007 db78660430 Merge branch 'master' into release to roll forward to cl/338725629. 2020-10-23 12:49:48 -07:00
hai007 d707acd81c Merge branch 'google3' to roll forward to cl/338725629. 2020-10-23 12:48:07 -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
hai007 035cbd435e Merge branch 'google3' to roll forward to cl/337192067. 2020-10-14 16:07:43 -07:00
hai007 3b661a7e0e Roll forward to cl/337192067. 
Signed-off-by: hai007 <hais@google.com>
 2020-10-14 16:06:28 -07:00
hai007 90f2993e70 Merge branch 'google3' to roll forward to cl/337147929. 2020-10-14 12:58:01 -07:00
hai007 26edf9c30e Roll forward to cl/337147929. 2020-10-14 12:55:18 -07:00
hai007 e17bac4c70 Merge branch 'google3' to roll forward cl/336363104. 2020-10-09 14:53:41 -07:00
hai007 0738d06b0a Roll forward to cl/336363104 
Signed-off-by: hai007 <hais@google.com>
 2020-10-09 14:14:41 -07:00
Alexey Polyudov a472de7266 Merge branch 'google3' 
Change-Id: I99e72f30bb4b8f975d61a940a7c7b746dba07796
 2020-10-01 02:32:02 -07:00
Alexey Polyudov bcc3f21da2 Roll forward to cl/334770381 
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I22b685b17c37357d6281cedfa7c228e304de8835
 2020-10-01 02:31:10 -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 48fac30b05 Merge branch 'google3' 
Change-Id: I9c915cdf568c4856a990d1dfc067b81a424b4eb2
 2020-09-15 00:32:19 -07:00
Alexey Polyudov af150850cd Roll forward to cl/331709254 
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I3a4a4d6c1735c61204053bc82165ab91705d95f6
 2020-09-15 00:09:57 -07:00
Alexey Polyudov dc65625d36 Merge branch 'google3' 
Change-Id: Iac43cc18efc80e7cca66ffa7cd2e472603ac4afc
 2020-09-14 02:01:04 -07:00
Alexey Polyudov 3b7071cf0f Roll forward to cl/331498408 
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: If30a8df80799adec3aafba5b8dd4c539fc21e16d
 2020-09-14 02:00:27 -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
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 663db687ec Merge branch 'google3' into master 
Change-Id: I370d06668a5be888d5cc34afe3a9247694cfb9c0
 2020-07-15 11:17:23 -07:00
Alexey Polyudov 6f9228fa6b Roll forward to cl/321106672 
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: Iabb20e9c7f7487268fa3ebbbeb58540092e10e0e
 2020-07-15 11:16:39 -07:00
Alexey Polyudov 8216e230a8 Merge branch 'google3' into master 
Change-Id: Ibf73c8b6289591d08b5075af535ce13553442ee8
 2020-07-07 12:51:12 -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 999cdd9903 Roll forward to cl/320013226 
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I8be5378519ca952da43c40fba96141a7f8517748
 2020-07-07 12:35:39 -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 30039f266f Merge branch 'google3' 
Change-Id: I0c3068279f34e50b286caf84940281f5b5e4dfbb
 2020-06-24 18:19:54 -07:00
Alexey Polyudov a4ef9ee564 Roll forward to cl/318180324 
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I71bb49fe74104964088d392b12775ec2a253b1c9
 2020-06-24 18:15:07 -07:00
Alexey Polyudov 412273d317 Merge branch 'google3' 
Change-Id: I2c5f890e76873090819e7569b214af829bfd0daf
 2020-06-24 10:57:51 -07:00