commit | 1ba1044dc9fc47de099db4a3cd54196b0a552e26 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Aug 04 07:37:30 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Aug 04 07:37:30 2018 -0700 |
tree | a70235945948deff0968ff1af50a810795685572 | |
parent | 2f9282d478ae7ebe927bdc4bca787990dc809907 [diff] | |
parent | 483468f6d9db2a33f354e4ef3669e0de7937dcb6 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e4792b3964 -s ours am: 483468f6d9 -s ours Change-Id: I167eef8a8571b13487fd2739b2127a3311bc9ed2