tree 9e6c7fb4f79cb5fae6e2afed9fbbc8440ce799d0
parent 6ab25ba5f19eca77a1e9290bf23171afe4cbfbfa
parent fa8e6c0f5a3273f5cd1e2ddb1b41ae6a8e03467d
author Jeff Davidson <jpd@google.com> 1479873967 +0000
committer android-build-merger <android-build-merger@google.com> 1479873967 +0000

Merge "Expose TelephonyManager#{set,get}DataEnabled." am: 99d6227782
am: fa8e6c0f5a

Change-Id: I55d2e8ffcf70aad48acdf1fa97da5b2874d26925