diff options
author | Baligh Uddin <baligh@google.com> | 2014-08-17 14:41:42 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-17 14:41:42 +0000 |
commit | 902c0c4d8f24fffaf7b49d0de48c48dca49e7677 (patch) | |
tree | daeafdc4df0a6a2f5b2fbea8bfb8cd2f84f5eb83 /tests | |
parent | 346249eb6d42c2121928cb8320aaf6b5c00dfdc4 (diff) | |
parent | 1169cd85d22b83c1d56a54c5e7291df0031371f0 (diff) | |
download | packages_apps_Settings-902c0c4d8f24fffaf7b49d0de48c48dca49e7677.zip packages_apps_Settings-902c0c4d8f24fffaf7b49d0de48c48dca49e7677.tar.gz packages_apps_Settings-902c0c4d8f24fffaf7b49d0de48c48dca49e7677.tar.bz2 |
am 1169cd85: (-s ours) am 1f4e0347: (-s ours) am f14fa7ed: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '1169cd85d22b83c1d56a54c5e7291df0031371f0':
Import translations. DO NOT MERGE
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions