summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2012-09-10 17:16:02 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-10 17:16:02 -0700
commitea7a7d436676526cb14e55ed58ac66ef4349c8c7 (patch)
treed3460cf4628679ee90171444e302be846dfbf005 /src
parentddb438917056b815a89983a1472e212be6e36869 (diff)
parent8f1136241df1544df54e653b007ca96da98ebae6 (diff)
downloadpackages_apps_settings-ea7a7d436676526cb14e55ed58ac66ef4349c8c7.zip
packages_apps_settings-ea7a7d436676526cb14e55ed58ac66ef4349c8c7.tar.gz
packages_apps_settings-ea7a7d436676526cb14e55ed58ac66ef4349c8c7.tar.bz2
am 8f113624: (-s ours) am 955f3477: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '8f1136241df1544df54e653b007ca96da98ebae6': Revert "Import translations. DO NOT MERGE"
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions