tree 2f1b9dd086f7ffbe4cc0387360f4518af9624b40
parent 3b84dc5c781349bac9f4fd2e4ab8746c27fba6f0
parent d4c6c7b703a6725ddb7c7a48e229a3ab8aede343
author Shuo Qian <shuoq@google.com> 1501802596 +0000
committer android-build-merger <android-build-merger@google.com> 1501802596 +0000

Merge "Add vts test for setCarrierInfoForImsiEncryption" am: afcdb1effb
am: d4c6c7b703

Change-Id: I83091fa9a0374478a6a0c69a3787cb061967f257