commit | 8c5514b186f0da778277c33415c658687b665fa4 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sun Nov 11 01:31:19 2018 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Sun Nov 11 01:31:19 2018 +0000 |
tree | 05c3f64527833b5b61c5c8f6212b5123a31aded7 | |
parent | 3fa917c8bc32624caffdf539cef74858580c22da [diff] | |
parent | cbaf1505a077cc2622e1421a729c3d36808d9db9 [diff] |
Merge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into oc-dev * changes: [automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped: d9cf1de3e4 [automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 Import translations. DO NOT MERGE