commit | ab24acf4dbaaa3daba4a603ec20289574fc6f21c | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jan 26 21:21:55 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jan 26 21:21:55 2018 +0000 |
tree | 0087a26f7ccbf6769d38aac2097e2256f2767d52 | |
parent | 5c906e6acead9a1313b6ab8cde580bdfdc398565 [diff] | |
parent | 6ab6643d3e63496c84063a0cf6ec4e0a5daacfb4 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 497bbfd9ac -s ours am: 6ab6643d3e -s ours Change-Id: I18094c4478691bb3709222a945b304b0c9dc73fb