commit | 8daef56a1cb91ff3ca6274eb815dddba89db4fc5 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Dec 08 17:24:57 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 08 17:24:57 2016 +0000 |
tree | b433d1c18a264fd5bd574f2d008797993077738d | |
parent | 5966efe1cd65d58e0eb9463290a857dce73bd455 [diff] | |
parent | ceb0716eba4c99c81fb04f7d3e81a1481719ac39 [diff] |
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: df9a47a79f -s ours am: ceb0716eba -s ours Change-Id: Ic8232735cc2584df7c164ce48b2dfc505638f84f