summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-12-30 12:14:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-30 12:14:29 +0000
commit7f55e9685e11a664e2759a60d719cc2a58a6a400 (patch)
tree3b878d445d13efa6341b143ad609212c33e4d0d9 /tests
parent0223c588de5cc73e5dcf8cd5d81da24990cff3b0 (diff)
parentc0b5d542b6f68dfcd0c90496d487986c9727da84 (diff)
downloadpackages_apps_Settings-7f55e9685e11a664e2759a60d719cc2a58a6a400.zip
packages_apps_Settings-7f55e9685e11a664e2759a60d719cc2a58a6a400.tar.gz
packages_apps_Settings-7f55e9685e11a664e2759a60d719cc2a58a6a400.tar.bz2
am c0b5d542: (-s ours) Import translations. DO NOT MERGE automerge: c3068f0 -s ours automerge: 9602ba3 -s ours
* commit 'c0b5d542b6f68dfcd0c90496d487986c9727da84': Import translations. DO NOT MERGE
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions