tree 070dcecf7aefba22199a1412b42e34a18f4e5b29
parent 3b09d5028c2bda2bc38ff4c748ee2accfb4412f1
parent c3fddb984c9bca51c0df3a528764cbb817627850
author Adrian Roos <roosa@google.com> 1474682860 +0000
committer android-build-merger <android-build-merger@google.com> 1474682860 +0000

Merge "Show PLMN on CryptKeeper" into nyc-mr1-dev
am: c3fddb984c

Change-Id: Ibf53419b03256edbcd24805151474a14caac4e38