Commit Graph
111 Commits
Author SHA1 Message Date
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 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
Alexey Polyudov b4d8577b98 Merge branch 'master' into release
Change-Id: Ifdbfd91abe22f9dd05bb1c0122caea358711569a
2020-10-22 11:16:05 -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 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
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 e7e473b763 Roll forward to cl/333580336
Signed-off-by: Josh Nohle <nohle@google.com>
2020-09-24 14:01:28 -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 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 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 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 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 ef97891ec3 Merge branch 'master' into release
Change-Id: I8a6cfe28093bf3d60dc91bcbc4e98e641764c4c0
2020-07-07 12:54:19 -07:00
Alexey Polyudov 8216e230a8 Merge branch 'google3' into master
Change-Id: Ibf73c8b6289591d08b5075af535ce13553442ee8
2020-07-07 12:51:12 -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 1c44f4bbdd OSS fix
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I7c1c0f3e1f60df706e47a90ed43a6878f665ae85
2020-06-24 18:21:36 -07:00
Alexey Polyudov 8f77e10f9b Merge branch 'master' into release
Change-Id: I09eb3de26d6e77008add7091c6ebdbd0e4d5575a
2020-06-24 18:20:45 -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 7be16eb015 Merge branch 'master' into release
Change-Id: I56ea2217899e92bdd9d6cb56797ac9895e194fff
2020-06-24 11:01:46 -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
Alexey Polyudov 0e87f41216 Merge branch 'master' into release
Change-Id: I6e5c45cffa1cae932ca1e7294f3b6ef1be26b8ee
2020-06-04 13:04:42 -07:00
Alexey Polyudov 264ff0256d Merge branch 'google3'
Change-Id: I08c677177d69e257e6fbe6aa32a5854e0eae8c52
2020-06-04 12:44:32 -07:00
Alexey Polyudov 04473705f8 Merge branch 'master' into release.
Change-Id: Id627ceca5ef60281e024ff80fc1848b3ccb6c14d
2020-06-04 12:01:48 -07: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
Alexey Polyudov 3e7bf3074f Merge branch 'google3'
Change-Id: I8b28b1d3a5280581f20e4edf9144641a12df8879
2020-06-04 10:57:23 -07:00
Alexey Polyudov 7e19ffbab7 Release based on cl/313536507.
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I83ec7dee1a7ef6f4bdfd47482c94d03910525b7e
2020-06-04 10:06:31 -07:00