commit | d7a7742162e9b9191c3940b5572b2baecc98dff7 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Sep 25 08:02:38 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 25 08:02:38 2019 -0700 |
tree | 3b1b9217cf9d5c3a32a0a3c830ea3f88c15fe73c | |
parent | a73b48e122bf491149d5c070d917196453014a70 [diff] | |
parent | 1735eebfc931a9411db69ac8eb9150fa7185ae8d [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6a40932ee2 -s ours am: 1735eebfc9 -s ours am skip reason: subject contains skip directive Change-Id: I55e11d97aa07d4605cd3fb0539b3e7d59f0cd04b