commit | 5227845a2df1df74b99f8c7af03977a7ff3c14c4 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Oct 29 13:42:35 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Oct 29 13:42:35 2018 -0700 |
tree | 2572a3834bfe10d4a73efa517f7609ce75660259 | |
parent | d6165379459d22884e564dc3fbf6676e5ee9fa81 [diff] | |
parent | 44cdc62aca14bf7db3e5eb5d4a2c60b8c20a098d [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: c60c2527ae -s ours am: 44cdc62aca -s ours Change-Id: I533f4ef42844be0d9a16f8d4feb5d93dc104fc3c