commit | 06eb5667ed1a2388d4fb65e853d3eb9fa8e4cc6e | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Nov 21 01:46:35 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Nov 21 01:46:35 2016 +0000 |
tree | 2406fe8280cf92fb931fa11c7e69e351249326c5 | |
parent | 2ccab548b48407d10fc11d601368225a7c768926 [diff] | |
parent | 7a85128ea0e6147dfec485a4222a0cb4c3a299d0 [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 2b8d4b588a -s ours am: 7a85128ea0 -s ours Change-Id: I8cf2cff387a0b27f244d057446762de4ab22d322