commit | 2296d3962ac4ef38bb8615f9fef95b980413fa6b | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Aug 12 18:34:06 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat Aug 12 18:34:06 2017 +0000 |
tree | 69035935a38013b5d70daa9e37fbb5a45087bf48 | |
parent | 66bf0f6909ba852694d57d7c35d9bc90b68ea300 [diff] | |
parent | adadcbd5ee4862a280cb7b62dcf21e1513b64d6a [diff] |
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: f691736e82 -s ours am: adadcbd5ee -s ours Change-Id: Ic550bc35c8866a9822c51c9a5f16405cf683ec5a