commit | ef47878192451d8ae65caa8b479a088c49fbe9d3 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Feb 03 10:48:05 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Feb 03 10:48:05 2016 +0000 |
tree | 78148f4ea7a01b1dc65fa2ac0114409cf1e48c62 | |
parent | 01261616f00a611709298195f6137cfea3529417 [diff] | |
parent | 3cddac44fd60e05047aa510b6d4973b47dec0475 [diff] |
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: b697973e2a -s ours am: 0291cf7113 -s ours am: 3cddac44fd -s ours * commit '3cddac44fd60e05047aa510b6d4973b47dec0475': Import translations. DO NOT MERGE