summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-03-04 14:14:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-04 14:14:29 +0000
commit850fd489dea0cdf7199cce73027fc95658b0993f (patch)
tree7d5baa6fdc44257dc28edef4cc78070ea8293bc7 /packages/SettingsProvider
parent116b9336e2798fdbdea1b98aa4455b485268587b (diff)
parentb214417a6e1a7cca5bac961c2b32b72d8baea2dd (diff)
downloadframeworks_base-850fd489dea0cdf7199cce73027fc95658b0993f.zip
frameworks_base-850fd489dea0cdf7199cce73027fc95658b0993f.tar.gz
frameworks_base-850fd489dea0cdf7199cce73027fc95658b0993f.tar.bz2
am b214417a: (-s ours) am 3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'b214417a6e1a7cca5bac961c2b32b72d8baea2dd': Import translations. DO NOT MERGE
Diffstat (limited to 'packages/SettingsProvider')
0 files changed, 0 insertions, 0 deletions