tree 1ad197befc7a9662ae90f649d8c4962ed39ca228
parent 7e99b263b590bd1c9885acf541efcba927449e1c
parent c5630f8247141a346790ce9a5454629a0d297115
author Ruben Brunk <rubenbrunk@google.com> 1457740718 +0000
committer android-build-merger <android-build-merger@google.com> 1457740718 +0000

Merge "Allow per-package exemptions for restricted AppOps" into nyc-dev am: 89db9dbedb
am: c5630f8247

* commit 'c5630f8247141a346790ce9a5454629a0d297115':
  Allow per-package exemptions for restricted AppOps