commit | 83150b5ad378adf9b33f4588d3f3ce3099260070 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Sep 06 21:11:29 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 06 21:11:29 2017 +0000 |
tree | 079050f59ebd846673bbf3a087e6bc3b7162fbdc | |
parent | 9384071d30042caa419dc2ed7d50d98ed7060df4 [diff] | |
parent | c8c4e5820b9473cf8014dc840b661bc3a21fb3fa [diff] |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: b1d8caa355 -s ours am: 58ba7d4cde -s ours" into oc-mr1-dev-plus-aosp am: c8c4e5820b -s ours Change-Id: Ie4570858fe2bd72844c39fff790cb213fb577def