commit | b64229234cc4fe7d0bc521492c25e3197c505ac0 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Apr 08 08:11:43 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat Apr 08 08:11:43 2017 +0000 |
tree | 7fa8359790e72a8373ee470e6c07de99fb126079 | |
parent | e492550158e250ee41f0d4d77fe39df2a1c64f06 [diff] | |
parent | 146f901c9b22adfed1c265cb4738746f92e01c5c [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: df12f01abd -s ours am: 146f901c9b -s ours Change-Id: I8f49d02b3ae75bbf6a91ce8715041f4368813784