tree a463b31cb629961f97c2f96ec3732731ed7b743a
parent 9715247a543f769bcb01f176b718f4625c0f48e6
parent 969f4742f4f66f6a9e231d6e50c870db66dc50a6
author Polina Bondarenko <pbond@google.com> 1484942592 +0000
committer android-build-merger <android-build-merger@google.com> 1484942592 +0000

Merge "Add feature flag for TelephonyManager#get/setAllowedCarriers" am: c4fc77792c
am: 969f4742f4

Change-Id: I7e755924f2a3e1556fcdc47068c0a863276ce984