summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-05-14 18:45:37 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-14 18:45:37 +0000
commitaed06368d3c2c112fc2f22cd1442b2cd9d3e5b0b (patch)
tree8331e3f47bcf9757858c97e5779b7062cbca7115
parentb774c8d9032061e6d3fedc36e643d989df52a1ff (diff)
parentcbbe7b4c5a03ab96ceea99808ecadafb84634f3f (diff)
am 190a89a4: (-s ours) am 7d298cb0: (-s ours) am ffc9dd5e: (-s ours) am 3abf9a31: (-s ours) am c7e9e39d: (-s ours) am 123c62a0: (-s ours) am 58e89bee: (-s ours) Import translations. DO NOT MERGE
* commit '190a89a40f2ea86c601dde6dbe5871dadd977810':
0 files changed, 0 insertions, 0 deletions