commit | b8953810e87cdf1e0eb0569235f8670544328f10 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Nov 21 02:09:48 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Nov 21 02:09:48 2016 +0000 |
tree | 2406fe8280cf92fb931fa11c7e69e351249326c5 | |
parent | c2574b9ba684638610454dcf8948964ca37d41de [diff] | |
parent | 56cfda2ed4c0ae43280393bd3a50034d6eb83759 [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f94b944f80 -s ours am: 56cfda2ed4 -s ours Change-Id: Ia1590d2e57d40b54fc799ba63a6e488b131dcc2f