commit | d648b70ecaa510ea193df487dfb101039ab162ca | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Tue Jun 18 23:08:48 2019 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 18 23:08:48 2019 +0000 |
tree | 90d724e7784994ae01771f9f83600f581f03364c | |
parent | baeccac9f53ca7ce8ed6bfbda08ea2ef8546313e [diff] | |
parent | f15a2dd3947c323bf06a90b0a6564bea970ea32d [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9ea1842c38 -s ours am: 5e26e1d81c -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp