tree c73070174f2613e4a2aa4f55858f6af55e52d69c
parent 539a32f2d48fd7aacdf15f6986b4a046176e4d45
parent f39701f6f782737aed1746ee536a0dfb1cac6165
author Android Build Merger (Role) <android-build-merger@google.com> 1483991759 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1483991759 +0000

Merge "Don't set USER_FIXED when revoking a permission inside Settings -> App. am: f7d0ef9f74 am: 549ff21c21" into nyc-mr2-dev-plus-aosp