commit | 1363c92690daadc6f4592f6cb33fa1addf26c8c6 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Dec 15 14:45:59 2014 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Dec 15 14:45:59 2014 +0000 |
tree | 26d19ad333c422307f5aa9a2180498e6a8d0c42c | |
parent | c9a6ccaa1d1efe9e72a5b9fdffc0aeb464a19355 [diff] | |
parent | 06b284f22b51cb27ecad920ee1fa11806e45d935 [diff] |
am b6a5dab3: (-s ours) am feb6c7f3: (-s ours) Import translations. DO NOT MERGE automerge: 06b284f -s ours * commit '06b284f22b51cb27ecad920ee1fa11806e45d935': Import translations. DO NOT MERGE