tree 975b8b4a2c0addc5168edf8f389e250ec3d42063
parent bad318fc935e953323dcce43e1a5939f8c9cbc6c
parent 00644ec5ccec7e3bed01d0585a0130067bbd9648
author Pengquan Meng <mpq@google.com> 1507832807 +0000
committer android-build-merger <android-build-merger@google.com> 1507832807 +0000

Merge "MSIM: Fix to show PUK view when two sims locked on PIN."
am: 00644ec5cc

Change-Id: Ic0b0927a52f2734cccff6f977aa0dfe9cd6e8d5c