tree 469998c4dc6edf038d0fa4dea028778396e30670
parent 386af5159d0243f2dfe514cda6a3e4e8da630b76
parent 05ec93ebc9cde5f77471ae3d6f37221785d298d3
author Felipe Leme <felipeal@google.com> 1559061171 -0700
committer android-build-merger <android-build-merger@google.com> 1559061171 -0700

Merge "Made Context.CONTENT_CAPTURE_MANAGER_SERVICE visible for tests." into qt-dev
am: 05ec93ebc9

Change-Id: I4e26c7106070cde92bfacab7cbc99d4221a1791e