commit | 68a3e65ecdc51386c44699903fb696f35bf8fedc | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Nov 30 21:10:57 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Nov 30 21:10:57 2017 +0000 |
tree | 62d787e248df0cf368e0546c1926f772c2fe0f99 | |
parent | fcd96e847f3bafc072421a60c2151d94db0e6013 [diff] | |
parent | 18fd5109c90bc508f87da73ec930227a960174cf [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 18fd5109c9 -s ours Change-Id: I66a71face01ca5e2e3fa1ee720cf85b68af6d6aa