tree b7194067c5f41e596a31e3ad9a1ba9637635040c
parent 8d837ace8bcff380ea8ce46e3447579db866d68a
parent 09b9551f01aefa976ad9d475bcbc4d8e8c940c51
author Pengquan Meng <mpq@google.com> 1554157049 -0700
committer android-build-merger <android-build-merger@google.com> 1554157049 -0700

Merge "Enforce permission check before identity clear" am: e8777aec44
am: 09b9551f01

Change-Id: I0c51b504d1d54bcbdeb7f4d4ad573a854579437e