commit | 22cf5296bf51c5156f814222ee05e366f4d59904 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Sep 25 07:50:07 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 25 07:50:07 2019 -0700 |
tree | 3b1b9217cf9d5c3a32a0a3c830ea3f88c15fe73c | |
parent | ad205aa3d2890598782a7214815dc628f5cd42e3 [diff] | |
parent | 071424bf41f0b7b6448a7f3d4df0cd9cd94e22e3 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 355dfa6850 -s ours am: 071424bf41 -s ours am skip reason: subject contains skip directive Change-Id: I54645bcf37dab935ac61377b5a2d2ca4252412d9