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
470 Commits 14 Branches 26 Tags
f37dfd2e8a876063946b9e04d889170bfdfd195b
Commit Graph
359 Commits
Author SHA1 Message Date
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 07822f018e Merge branch 'release' into github to roll forward to cl/340537221. 2020-11-03 15:32:43 -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 76d74805ec Merge branch 'release' into github to roll forward to cl/339936269. 2020-10-30 14:27:37 -07: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 fc9884ecf2 Roll forward to cl/338725629. 2020-10-23 12:59:40 -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 ce4807935e Roll forward to cl/338482889 
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: Ic2bdb234e89f3c5860d1b483dd4bce689f13d057
 2020-10-22 11:30:33 -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 13f8fddfde Merge branch 'release' into github to roll forward to cl/337192067. 2020-10-14 16:12:04 -07:00
hai007 c8533a1b44 Merge branch 'master' into release to roll forward to cl/337192067. 2020-10-14 16:09:33 -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 18542b478e Roll forward to cl/337147929 
Signed-off-by: hai007 <hais@google.com>
 2020-10-14 13:08:04 -07:00
hai007 14d5793e04 Merge branch 'master' into release to roll forward to cl/337147929. 2020-10-14 13:00:42 -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 5fd30491bc Resolve conflics from previous commit. 2020-10-09 17:34:34 -07:00
hai007 5dc9b74a07 Roll forward to cl/336363104 
Signed-off-by: hai007 <hais@google.com>
 2020-10-09 15:08:34 -07:00
hai007 2b9639b0e2 Merge branch 'master' into release to roll forward cl/336363104. 2020-10-09 14:58:52 -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 7ec6783248 Roll forward to cl/334770381 
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I0ddbbb1ee5a66060429acaa425340a08c27ea015
 2020-10-01 02:51:10 -07:00
Alexey Polyudov db1248d771 OSS fixes 
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I76049a5776a3d3603e9d2415d3242199bc136a22
 2020-10-01 02:48:58 -07:00
Alexey Polyudov b043a920a5 Merge branch 'master' into release 
Change-Id: Ibcaf3ca7680825f3acc2c00ce0dc299a01413301
 2020-10-01 02:47:19 -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 74fbb495ed Roll forward to cl/333580336 
Signed-off-by: Josh Nohle <nohle@google.com>
 2020-09-24 14:12:46 -07:00
Josh Nohle 1e91e392ba Merge branch 'master' into release 2020-09-24 14:10:21 -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 a4adec6655 Merge branch 'master' into release 2020-09-24 13:23:20 -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 4e3f343b7a Roll forward to cl/331709254 
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I1f0b645549f75c08a7af4512265cef8eadc7e672
 2020-09-15 00:41:58 -07:00
Alexey Polyudov b9ce9ac740 Merge branch 'master' into release 
Change-Id: If219908e21619e3445993106fb255b7d6ef42d74
 2020-09-15 00:32:43 -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