tree d71d18391b03d0517dee3a04b9133ae91f74dc11
parent 82dc673388351171df98d2546ee6c0a457fb4a62
parent 44a81dadaf6e929fc48dee0c2b6a847f1d0dbe48
author Shuo Qian <shuoq@google.com> 1501270193 +0000
committer android-build-merger <android-build-merger@google.com> 1501270193 +0000

Merge "Merge "Add vts test for setCarrierInfoForImsiEncryption" into oc-dr1-dev am: e7acb1f8cf am: 4cd75fca1f" into oc-mr1-dev-plus-aosp
am: 44a81dadaf

Change-Id: Ibe97b61253476374038c03d83b6c163004dd78e8