tree bc0cf9fc57cd6948f457e73492d3dbe684320dcb
parent cf1a558aed1b5dd28ce5daab4713568ceb6ddbd6
parent b369ad4b19c083e0a0884810a31c3f36316199db
author Jeff Davidson <jpd@google.com> 1479874463 +0000
committer android-build-merger <android-build-merger@google.com> 1479874463 +0000

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

Change-Id: I0ed5ac68a7974ade21b1d6aa2279fde179070c0c