commit | ee7899a572f2e575bb1a6a6dbc83ffe8673a8f18 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Apr 02 09:06:15 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sun Apr 02 09:06:15 2017 +0000 |
tree | be7a9c7e385729baac1f177141725fd02e9d4529 | |
parent | bca7ad5004837388aaf51633925ea9c77b945d99 [diff] | |
parent | d81d46b334eead8ad45db30d4d4f24d4124a76cd [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ae1e284380 -s ours am: d81d46b334 -s ours Change-Id: Ifb3d5693ccd59babe6855ce13ce018e489cb9f89