commit | 722737c43b43a5373ff8fdb21b0e6516ff1886c8 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Sep 30 12:46:38 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 30 12:46:38 2015 +0000 |
tree | 02193d05aecf182b9eedb4e18447918358f5613b | |
parent | e21d43d0e5b741b79b2355754782484b38c9d219 [diff] | |
parent | a462b2862a8694ba76ea7ee9047eab5ce7a2f769 [diff] |
am a462b286: (-s ours) am 99842468: (-s ours) am afc38312: (-s ours) am 77fc6ac5: (-s ours) Import translations. DO NOT MERGE * commit 'a462b2862a8694ba76ea7ee9047eab5ce7a2f769': Import translations. DO NOT MERGE