commit | d5bd38382429aaecb37c253b145411bdbd67ed26 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Aug 02 03:12:34 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Aug 02 03:12:34 2016 +0000 |
tree | 24038d74e8451b8006b3f24a49ea878fe59c8c5e | |
parent | 0e2e179662115305328d0f5127cad037b28d53d4 [diff] | |
parent | 424dacefecf57ba76c97aebc49682afa28bbe70b [diff] |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: fc9ad02469 -s ours am: 3f578ad25e -s ours am: 424dacefec -s ours Change-Id: I912a77158aa08b1685f34f0afb7a4c02f6ebcd0a