tree fad52e75aaee1754709cddb2aefb10a6cf737b7f
parent 260fe2209bb76d6460dc64ec3c3eab4f6a2dfdd0
parent 234e9a28ee88b9716c724244c85e8d271281ce1f
author Junda Liu <junda@google.com> 1470700461 +0000
committer android-build-merger <android-build-merger@google.com> 1470700461 +0000

Merge "Require sim-card-with-cert token for carrier api test." into nyc-dev
am: 234e9a28ee

Change-Id: I10a2bdc8f70d84c998b536196e8bdc314f82f395