sqian 7fde1c770b resolve merge conflicts of b96891b805 to master ...

Test: I solemnly swear I tested this conflict resolution.
Bug: 113072551
Change-Id: I0077bfea84e5ff9a37bfc8c84c7d1d38872f3561

2018-09-06 23:05:46 +00:00

..

current.txt

resolve merge conflicts of b96891b805 to master

2018-09-06 23:05:46 +00:00

removed.txt

Merge "Actually @hide unwanted capability methods." into pi-dev am: a09c06a6c1

2018-04-24 14:50:14 -07:00

system-current.txt

Hide Vr2dDisplayFlag annotation

2018-09-04 10:58:27 -07:00

system-removed.txt

Always review permissions before <M app is started the first time

2018-07-24 11:45:34 -07:00

test-current.txt

Merge "[Magnifier-48] Allow on-the-fly zoom update"

2018-08-31 09:03:30 +00:00

test-removed.txt

…