summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/WirelessSettings.java
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-07-01 07:47:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-01 07:47:44 -0700
commitc40e5ffff9700ec63a5bb08600a8f18301037a20 (patch)
treeffc629645d1fa477300ea77749aefd896614f775 /src/com/android/settings/WirelessSettings.java
parent902d1bc4842526a6d938e4e6f4c3686c9ff45d94 (diff)
parent6ab277ee50d91bb6b50cacda55e84ac3afc4323b (diff)
downloadpackages_apps_Settings-c40e5ffff9700ec63a5bb08600a8f18301037a20.tar.gz
packages_apps_Settings-c40e5ffff9700ec63a5bb08600a8f18301037a20.tar.bz2
packages_apps_Settings-c40e5ffff9700ec63a5bb08600a8f18301037a20.zip
am 6ab277ee: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '6ab277ee50d91bb6b50cacda55e84ac3afc4323b':
Diffstat (limited to 'src/com/android/settings/WirelessSettings.java')
0 files changed, 0 insertions, 0 deletions