Merge "Add vts test for setCarrierInfoForImsiEncryption"
authorShuo Qian <shuoq@google.com>
Thu, 3 Aug 2017 23:17:33 +0000 (23:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 23:17:33 +0000 (23:17 +0000)
am: afcdb1effb

Change-Id: I08ab4ff325457ee5242060a5b40e56ce0c227ad4


Trivial merge