summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/location
diff options
context:
space:
mode:
authorMady Mellor <madym@google.com>2019-09-11 17:17:30 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-11 17:17:30 -0700
commite84a8863d5d29c1c02073ba76121804c5667adc0 (patch)
tree0e010fbf02804dd35c7a48b6d3d1e982735362dc /src/com/android/settings/location
parent8eb388c906fa4cea380869acc13d6cdbbe286978 (diff)
parent88de4328fdfea7aea80e3343439bb20e79db6a40 (diff)
downloadpackages_apps_Settings-e84a8863d5d29c1c02073ba76121804c5667adc0.tar.gz
packages_apps_Settings-e84a8863d5d29c1c02073ba76121804c5667adc0.tar.bz2
packages_apps_Settings-e84a8863d5d29c1c02073ba76121804c5667adc0.zip
[automerger skipped] Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev-plus-aosp
am: 88de4328fd -s ours am skip reason: change_id If2b813f24cf5998829fe417e32179c5e8283d308 with SHA1 0c47113a5b is in history Change-Id: I35a625ba0a09a0a35da1f38795dc34201838a084
Diffstat (limited to 'src/com/android/settings/location')
0 files changed, 0 insertions, 0 deletions