tree 1ae24a938fe950699890b53f2cc543df6e7f9f05
parent 2f1bcb0e0c325489d80da6aebcf0eb74f5c8b210
parent 8d837ace8bcff380ea8ce46e3447579db866d68a
author Xiangyu/Malcolm Chen <refuhoo@google.com> 1554155379 -0700
committer android-build-merger <android-build-merger@google.com> 1554155379 -0700

[automerger skipped] Merge "Add PRIMARY_SUBSCRIPTION_LIST_CHANGED in AndroidManifest." am: 60635bb35a am: 2251e4c22f
am: 8d837ace8b -s ours
am skip reason: change_id I40ea487f2b7cc175bea21281a2594cc31088b74f with SHA1 898fa809d8 is in history

Change-Id: Ic94372249cee9543f87a75654591401ef22b84b1