summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2012-07-26 08:15:17 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-26 08:15:17 -0700
commit82ab59f221cfb5865ddb30b815fda294df3aa2b1 (patch)
tree5023564b0d4befdbfd2055e55fb17f0c2dbe06a9
parent298a916348a4a0a5f7cbb097f6a61d70c1cf769e (diff)
parentb1fcdd606d63fa43dc6a0aeeca13e3784cfcbb6f (diff)
downloadpackages_apps_settings-82ab59f221cfb5865ddb30b815fda294df3aa2b1.zip
packages_apps_settings-82ab59f221cfb5865ddb30b815fda294df3aa2b1.tar.gz
packages_apps_settings-82ab59f221cfb5865ddb30b815fda294df3aa2b1.tar.bz2
am b1fcdd60: (-s ours) am 36166474: Merge "Import translations. DO NOT MERGE"
* commit 'b1fcdd606d63fa43dc6a0aeeca13e3784cfcbb6f':
0 files changed, 0 insertions, 0 deletions