diff options
author | Xin Li <delphij@google.com> | 2019-07-02 15:16:40 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-02 15:16:40 -0700 |
commit | d4ab83e0ddfac08f8024d9a0e3fc862ae38411a5 (patch) | |
tree | fbfba66e46e8eb41ed5f18eee646b5cd72dd4583 | |
parent | 4f543eb2e85a4b140d829ba5e186c895923f67fc (diff) | |
parent | 771223db7e4c150328436b0e12ac965021944ba2 (diff) | |
download | armv7-a-neon-d4ab83e0ddfac08f8024d9a0e3fc862ae38411a5.tar.gz |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: cd664d9966
am: 771223db7e -s ours
am skip reason: subject contains skip directive
Change-Id: Icec42228d71cfde746539dc7aa7d20f77699f639
0 files changed, 0 insertions, 0 deletions