commit | c5eef68f405ae7018671ab04a6c76035e972287c | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jul 07 16:43:46 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 07 16:43:46 2017 +0000 |
tree | f697d0bab4efb2c239b998513a65061e66f8b871 | |
parent | 12996deb77321d8c6aae5cd87f50d7fab682be08 [diff] | |
parent | 4a4b0e572635ba4dde2ae327ebb72e2945fafb61 [diff] |
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 2fb78bafc7 -s ours am: 4a4b0e5726 -s ours Change-Id: Id36ca27107f7250850ff5c2004a70b55fb206c31