tree 43b88c3a8b450c5272d401588af33b479b863cf8
parent 34f04ffa0b9e42930f8cb753445e1f5f45cd11cc
parent 308bcec713f1dc246388adadf3159c7d877eb426
author Polina Bondarenko <pbond@google.com> 1485192489 +0000
committer android-build-merger <android-build-merger@google.com> 1485192489 +0000

Merge "Make TelephonyManager#get/setAllowedCarriers system api" am: 6d064d8780 am: cf176500e6 am: b46a93ff04
am: 308bcec713  -s ours

Change-Id: I89faa271ee2c384019d827f7981ae97b03f84e0e