| commit | 61632b84b613bb0bdd996c50cbc7cc26966ca141 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Oct 20 16:11:51 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 20 16:11:51 2017 +0000 |
| tree | b8b6458f71902ec8abef43b8370497a631aa5a2f | |
| parent | 5ac591340c6e1dc83795872569a6cddc17584c1a [diff] | |
| parent | a8c59645768c10ddbd13ddfc33d655a25084eb49 [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 639ee5c778 -s ours am: a8c5964576 -s ours Change-Id: Ia2ddb89614a8fadf9f91276f883fbd09f44b2066