tree dc536277c79e30595b6e8b6896439d07bdd8fdfb
parent 75d5e40387149349c63bc570aa7ea7ec04c6f0f3
parent cb39c1a9effe54b35538cd43ab39a8aadd88ee79
author Bryan Henry <bryanhenry@google.com> 1527285187 -0700
committer android-build-merger <android-build-merger@google.com> 1527285187 -0700

[automerger skipped] Merge "Allow changing signing cert for system apps that use shared users" am: f98f8a4c6c
am: cb39c1a9ef  -s ours

Change-Id: I6075b3b4ab6d204cce51d55ed86ae9df97ddca9d