summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Geoff Mendal <mendal@google.com> 2015-01-28 15:38:46 +0000
committer android-build-merger <android-build-merger@google.com> 2015-01-28 15:38:46 +0000
commit71122950bbdf9c4024ac1f9dcb8ee99ad272ff3b (patch)
treec9f619360367b0fc77eb6cbb3cb20a9d9aa6ab4a
parent4e04b1a068a29c5edff765a2dc1b5fedc58237b5 (diff)
parentda029217c891e989a569f327487b3db7ea7b0d81 (diff)
am a4293a9b: (-s ours) am 7608492d: (-s ours) Import translations. DO NOT MERGE
automerge: da02921 -s ours * commit 'da029217c891e989a569f327487b3db7ea7b0d81': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions