Commit Graph
17 Commits
Author SHA1 Message Date
Alexey Polyudov fc41a86ba2 Merge branch 'master' into release
Change-Id: Iaeb2144000bba05bf9532a55518b9549d7662361
2020-06-30 00:29:25 -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 a9f42d7a71 OSS fix
Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: I49defdf33502bd2921ef81b8430eb15ed14532a0
2020-06-24 11:02:33 -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
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
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
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