commit | 7845c968ce67d6b4339a78ce38c89032d570eddb | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Oct 25 03:57:24 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 25 03:57:24 2018 -0700 |
tree | 871cfcf5bb154e1528795edc34e9ecf8adc42586 | |
parent | a4875dce41e14d12e4bb1b0a1066fb9ace3391ea [diff] | |
parent | ebccff42db2d5fcb048077ce93ccb86cc1573d48 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 20add0a4c6 -s ours am: ebccff42db -s ours Change-Id: Ifaa93b8cbfe1791408980d66fdfc191d3e840e27