commit | c61ed6356d5d3008aa1284241e1a469a21bee9dc | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Nov 26 23:08:53 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sun Nov 26 23:08:53 2017 +0000 |
tree | 2b7bac3f8a1589c49df22031c7110824ca092d8a | |
parent | d2037b9997084037a522ea03f814b010dbde59ee [diff] | |
parent | 1ef2ec2264e9926a52cd4808eb2f61f7db049373 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 419407eaea -s ours am: 1ef2ec2264 -s ours Change-Id: Ib4a2d4cc1eb42015dfdf56fba3417918de2af670