tree 45f49a78617a72cc7f35387e543eb66b5eb6d2a7
parent a77a646d945ed081e360cf09b4f3131f4dd9839e
parent 34662c81ca9a4ad109be93abea72f1ff16ff2f9e
author Philip P. Moltmann <moltmann@google.com> 1540867132 -0700
committer android-build-merger <android-build-merger@google.com> 1540867132 -0700

Merge "Synchronize mPermissions to void NullPointerException." am: 9e7c6b3865
am: 34662c81ca

Change-Id: I61062a7141267d4bd246576b1e7379a1fe4951b5