Kevin Rocard 426bea313a resolve merge conflicts of 2e32d37877 to master ...

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I393be9e597ff1f72ec2c71efbbbc8e518398190a

2018-09-21 12:03:28 -07:00

..

2.0

VTS tests should be static

2018-05-16 18:04:57 -07:00

4.0

resolve merge conflicts of 2e32d37877 to master

2018-09-21 12:03:28 -07:00

all-versions

Merge changes from topic "share-buffer" am: 54c3572e99 am: 0005ac0e55

2018-08-17 18:43:28 -07:00