commit | b136ae3ae99a07458fc36d27421ebb96db389922 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Oct 12 10:54:14 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Oct 12 10:54:14 2019 -0700 |
tree | 58010163803f38eafdbc3549757e9f9190ef4b00 | |
parent | 851d34ad49dfd04b101c1ea9bbf3a0e831c286f6 [diff] | |
parent | 24cab7cdc7b9437f5e92505e8767b8ee7468bad8 [diff] |
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 0572da0269 -s ours am: e4997095b0 -s ours am: 24cab7cdc7 -s ours am skip reason: subject contains skip directive Change-Id: I5c125bec64b624d0cec95ebf117c8ffaccc2f45a