diff options
author | Xin Li <delphij@google.com> | 2019-07-02 10:00:54 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-02 10:00:54 -0700 |
commit | e0a8e3c4694c02bb4270b9d2ab46654748a25f68 (patch) | |
tree | 1009b6e11a804286faf3756622e79593bff36561 | |
parent | 018a51db6a7743fff706f19cbe998f6f0178b27c (diff) | |
parent | 7524d76c0e7a2c1c67376bf333caa463dfd52eb6 (diff) | |
download | marlin-kernel-e0a8e3c4694c02bb4270b9d2ab46654748a25f68.tar.gz |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: 7524d76c0e -s ours
am skip reason: subject contains skip directive
Change-Id: I2feabfe0834d981ec3c84cbe0ecff9682c6a5031
0 files changed, 0 insertions, 0 deletions