Merge "Rename getDataEnabled() to isDataEnabled()." am: 4898b704de am: 0b79745dd1
am: f026342263 -s ours
Change-Id: I991af9483fa932479f5a1af5809596ce067a69a8
This commit is contained in: