commit | f123f221db7ea4cf72f701feb9a653c57eb578f4 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Dec 21 17:44:38 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 21 17:44:38 2017 +0000 |
tree | 21fae73df9b543a27b7c4a81e0008a11315a5487 | |
parent | 7baaa51e627ab442f972390e8fe90577997476a7 [diff] | |
parent | 0bfcd7eef7f78247e32a55c8da690f914628d10f [diff] |
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c -s ours am: a683975c54 -s ours am: 0bfcd7eef7 -s ours Change-Id: I30395fbf54d028c4f2e8bd21aa362e9d8e993195