commit | e083c8ea8859bf6f0c59486411d087f49cd4adfa | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Nov 21 02:14:05 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Nov 21 02:14:05 2016 +0000 |
tree | 2406fe8280cf92fb931fa11c7e69e351249326c5 | |
parent | e71efd830b2af231cd43143f4ebfdb74bf834fb6 [diff] | |
parent | fb8a4d17c2b6ae497634a8f6742f6f9cf20a3887 [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: dc92c70106 -s ours am: fb8a4d17c2 -s ours Change-Id: Iad52ae446ff8eb6a628ef29a7bd2013e7f060994