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
3,860 Commits 14 Branches 26 Tags
32f1ed5ac550eaa207343abda57bb68a94de0c67
Commit Graph
3860 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
hai007 26edf9c30e Roll forward to cl/337147929. 2020-10-14 12:55:18 -07:00
hai007 e9dd5d32f0 Merge pull request #6 from hai007/resolve-conflicts 
Resolve conflics
 2020-10-09 17:40:21 -07:00
hai007 5fd30491bc Resolve conflics from previous commit. 2020-10-09 17:34:34 -07:00
hai007 f64801f3d8 Merge pull request #5 from hai007/cl-336363104 
roll forward to cl/336363104
 2020-10-09 15:18:59 -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 d8b7909402 Merge branch 'github' into github-master 
Change-Id: Ib7295faa47d5ef9501e5afc903774c7038d8b17b
 2020-10-01 02:54:06 -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
Alexey Polyudov fb9ea31ec0 Add .mm support 
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I2cc42ef9d05dfbbac6bb252f769682a43ab4c501
 2020-10-01 02:27:28 -07:00
Josh Nohle 8482024f9c Merge pull request #2 from nohle/cl-333580336 
Roll forward to cl/333580336
 2020-09-24 15:48:05 -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 0b64a6ca66 Merge branch 'google3' 2020-09-24 14:03:03 -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
Alexey Polyudov 3cadfac2f4 Roll forward to cl/331498408 
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I21206f5720b0805f8c08e6604fc3b1fe08592046
 2020-09-14 02:06:02 -07:00
Alexey Polyudov d3dd15e460 Apply OSS fixes 
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I0007cccbb113c72ea2d9786d04e3337b8e498611
 2020-09-14 02:02:36 -07:00
Alexey Polyudov e31189892d Merge branch 'master' into release 
Change-Id: I5545ab2431ea72b0dc51d98d16f0ac100787a2d9
 2020-09-14 02:01:48 -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 fd773bd431 Roll forward to cl/329875420 
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: Ie9d11d2168f0312ab1e5b4ecd557b3a03594d701
 2020-09-03 02:27:44 -07:00
Alexey Polyudov eb3315ee3d Merge branch 'master' into release 
Change-Id: I89401ad2264e728c6a9e5feadf00f92ce60c7248
 2020-09-03 02:23:32 -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 abc1cbf267 Roll forward to cl/328359974 
Change-Id: Id081e9ee4e78fc51e01992c1f2db3b9e32b3e776
 2020-08-25 11:37:16 -07:00
Alexey Polyudov 2d564a5539 OSS fixes 
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I7589a4099e17cf812494d9bf758b479eaffff329
 2020-08-25 11:36:27 -07:00
Alexey Polyudov 01e22ef713 Merge branch 'master' into release 
Change-Id: I1301beacba87281b5818eb5e3f54525919158918
 2020-08-25 11:34: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 ae277748ce Roll forward to cl/321106672 
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I6e34e075aa2cbbacba714019f6d0e7506313e53d
 2020-07-15 11:20:49 -07:00
Alexey Polyudov 65ded1d0e0 Merge branch 'master' into release 
Change-Id: Ieb7f2b392864096e9cd783ab89f32442bc57abe7
 2020-07-15 11:17:51 -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 0e066caada Roll forward to cl/320013226 
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: Icfd8521f6bff1ee746204825516121198c90da30
 2020-07-07 12:57:24 -07:00
Alexey Polyudov 57754ad65b Oss fix 
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I0ddbfaa28d7280197bf5ac4dcf1a407ade5bdc7d
 2020-07-07 12:55:46 -07:00
Alexey Polyudov ef97891ec3 Merge branch 'master' into release 
Change-Id: I8a6cfe28093bf3d60dc91bcbc4e98e641764c4c0
 2020-07-07 12:54:19 -07:00