Makoto Onuki 58105199f5 resolve merge conflicts of 25e893c7d5d3 to master ...

Test: build

Change-Id: I43d3eb486d8a6600cfc793d6324b8fe23a241f0f

2017-04-14 17:19:17 -07:00

..

current.txt

resolve merge conflicts of 25e893c7d5d3 to master

2017-04-14 17:19:17 -07:00

removed.txt

Address review suggestions for sensor direct report related APIs

2017-04-13 14:17:11 -07:00

system-current.txt

resolve merge conflicts of 25e893c7d5d3 to master

2017-04-14 17:19:17 -07:00

system-removed.txt

Address review suggestions for sensor direct report related APIs

2017-04-13 14:17:11 -07:00

test-current.txt

resolve merge conflicts of 25e893c7d5d3 to master

2017-04-14 17:19:17 -07:00

test-removed.txt

Address review suggestions for sensor direct report related APIs

2017-04-13 14:17:11 -07:00