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