am e34d0df2: Reconcile with jb-release

* commit 'e34d0df2b45258fafa0faa76dd55b658a777c637':
  Surface metered networks as "Mobile hotspots."
This commit is contained in:
The Android Open Source Project
2012-05-30 10:22:00 -07:00
committed by Android Git Automerger

Diff Content Not Available