commit | 5ac591340c6e1dc83795872569a6cddc17584c1a | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Oct 20 16:04:33 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Oct 20 16:04:33 2017 +0000 |
tree | b8b6458f71902ec8abef43b8370497a631aa5a2f | |
parent | e3f60e7f70a893cdcbefa60119650a5e76902541 [diff] | |
parent | 49cc0fd2f8d7c5e240c76c71171508e7942ed3af [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 422b17438b -s ours am: 49cc0fd2f8 -s ours Change-Id: If6132f679d6bd5aa37a1e4645c4494523babda6f