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