| commit | 8d4dffb2d95ef430b595cc388e8a4bd88ae31a2f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Mar 19 10:40:06 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Mar 19 10:40:06 2016 +0000 |
| tree | ea3880cfd76bc74f7ca4302c396767a704603ac6 | |
| parent | 964ba908db24e27fb811f95fde8160c612843ae8 [diff] | |
| parent | b90e25157bc23cf48fafebdb7d892e7612c77ff4 [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: de7ae79 -s ours am: b90e251 -s ours * commit 'b90e25157bc23cf48fafebdb7d892e7612c77ff4': Import translations. DO NOT MERGE