commit | d155dba63d6b6738b0e3798177dcfcd85297b877 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Nov 30 22:57:21 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Nov 30 22:57:21 2017 +0000 |
tree | 8a90516477f5582eb09a2b207b8291abbc50674f | |
parent | b6d988c4a82e0d6e945183eb9244ab5f0fd254d7 [diff] | |
parent | 2c57ac25c6d442ec7ba236ab51871ab9c3cc89e5 [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 2c6f7366fc -s ours am: 2c57ac25c6 -s ours Change-Id: I71ff293a1279cd06e1cb063cc2c22db160cd31f0