commit | fde55e10623733e2eede13baff77a7ce812dfcae | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Oct 20 16:48:28 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Oct 20 16:48:28 2017 +0000 |
tree | b8b6458f71902ec8abef43b8370497a631aa5a2f | |
parent | 1cee40b17257a55e6395e0bfe2cbac168a919b22 [diff] | |
parent | 0d729e292ed68b54718099b1be76421a7a479408 [diff] |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 65fb1c889a -s ours am: 0d729e292e -s ours Change-Id: I1d6c54f9c2ab8035115103772702e4d177a8c3b4