tree ca370e3009eb6c6db8eeaeb6ffc8ac9b4c14e6ac
parent 49b36b5fcc321d9f4b8aec97128b6d691c07363a
parent 4ac4ef7c9e9169ddd387ba599c3f5da05fd780fd
author Suprabh Shukla <suprabh@google.com> 1526540912 -0700
committer android-build-merger <android-build-merger@google.com> 1526540912 -0700

Merge "Adding MANAGE_APP_OPS_MODES to FrameworksServicesTests" into pi-dev
am: 4ac4ef7c9e

Change-Id: I9eeccd25c3d5eb5378a131c8785a67a8f2f44467