commit | a940b9943254e76ac0f861ad9e9e2eed814c4384 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Jul 01 17:20:42 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat Jul 01 17:20:42 2017 +0000 |
tree | 3377f20ca6fcfc2b5c2faee383b0cfe86099d247 | |
parent | 643dd703e387f157930dc2594b4e0bf2a9330664 [diff] | |
parent | 52bc57e1e58123ad1e4c39230aa2e9b38fbe031c [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: c393596c5c -s ours am: e1e9f796a0 -s ours am: 52bc57e1e5 -s ours Change-Id: Ie711f4391d77c6e482638c062bfd365893fdc96e