commit | 1ff708930b2263238abc00a8ad0f39e9d73baf22 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jul 01 05:04:01 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 01 05:04:01 2016 +0000 |
tree | 88de3ea9a1da0d30f0fb77023649e7c348d31e6c | |
parent | aecde507c7ec1af9748e32d8f8c22f138d5ae71c [diff] | |
parent | 88b5e9f534769a4b7121c20e4d36d37aa688f210 [diff] |
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master am: baedc65a8b -s ours Change-Id: I99e147e68c8caa5c5dcacaaf4e0a9697f5409790