tree 9c019151ab9f3c386c2e22e9ad7155ed90d03c6f
parent cd3c01b254099950f301ad252a1d4f9c0c13f116
parent e8c98b77854d39606960b0b6f5b5332c61e9a3d9
author Chris Manton <cmanton@google.com> 1442253266 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442253266 +0000

am e8c98b77: am f40365f1: am ae0b7ca9: am c9180528: Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev

* commit 'e8c98b77854d39606960b0b6f5b5332c61e9a3d9':
  Add capability to ignore carrier entitlement checks