commit | 28345564b1860b5ec9605d4c7cd57d08e4ddd74b | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Nov 21 02:18:15 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Nov 21 02:18:15 2016 +0000 |
tree | 2406fe8280cf92fb931fa11c7e69e351249326c5 | |
parent | 31174c35f099fa43440b37f9aa2d847d995f0ce8 [diff] | |
parent | c8d1cba0fa9f04131f7154533ad58c7eb3f1a812 [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 1ad0a421a6 -s ours am: c8d1cba0fa -s ours Change-Id: I485a1f07041a16db18feec8cc83b282363bec568