commit | 4af46d6999d0b56aff26d6c833aad66cc84401c3 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Dec 10 19:25:10 2014 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Dec 10 19:25:10 2014 +0000 |
tree | dc1be103c25c259dde75bcd17b59dc48349fb103 | |
parent | 3a426694ffa268b331c5b1fc5bb40460d6d883c5 [diff] | |
parent | da409fea8230c49666ed634aeb7db629fb9425f3 [diff] |
am 5431d1e9: (-s ours) am 2bb00d52: (-s ours) Import translations. DO NOT MERGE automerge: da409fe -s ours * commit 'da409fea8230c49666ed634aeb7db629fb9425f3': Import translations. DO NOT MERGE