commit | 67534b0deb980c969d7b336b7964a2c5f6fce46c | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Mar 21 14:14:31 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Mar 21 14:14:31 2016 +0000 |
tree | f34842d78811e4f752617518272272f15e235f9c | |
parent | d11e4912c96535690de7089232f718c881313695 [diff] | |
parent | 3385329d60daa9cbe0f437fc83eb9061f0b8a5ae [diff] |
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 921a346 -s ours am: efd58d9 -s ours am: 3385329 -s ours * commit '3385329d60daa9cbe0f437fc83eb9061f0b8a5ae': Import translations. DO NOT MERGE