commit | ae4dc784216d1b46d78e266c1fdea86924be253c | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Oct 11 20:17:36 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Oct 11 20:17:36 2017 +0000 |
tree | d6ca7b9de81ecfe05307f926e71bc4e9d34d70fa | |
parent | a97edf7785b57964a82717c969ede45f20c6da79 [diff] | |
parent | 1018a5d4a198fa32be018f9c7d10d72142c9a6b3 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours am: 1018a5d4a1 -s ours Change-Id: I7edb906e7c2e0e76cb4a523d3e70418c57fc14bd