commit | 6bfacb540c3e2d593e7917a88f6611157696c51a | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jul 30 11:58:17 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 30 11:58:17 2019 -0700 |
tree | 43f54d8049a2ede94e0017d632ada745b86950fe | |
parent | 181237a2467ea79ef65aa91eff558e0342f9dc6a [diff] | |
parent | b0d1548ece6fa6b543a676ac7f29de80d9720034 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8292b6bb44 -s ours am: b0d1548ece -s ours am skip reason: subject contains skip directive Change-Id: I2a131da1ad0218a02bf49a9929a04405d1023315