summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-07-02 15:19:27 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-07-02 15:19:27 -0700
commit97f9bd97b5ae1ebfe1c9d6e24f7f4c16d2312c77 (patch)
tree160446d273549cc5ee04e2ead3e8175ae8685512
parent5f897cbf7d271aa603ca107375bb8b7d03cf1df0 (diff)
parent07f7e0c186b1e68408e0cb1c20c758f9ca1f70c5 (diff)
downloadpoplar-97f9bd97b5ae1ebfe1c9d6e24f7f4c16d2312c77.tar.gz
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 5eb0896667
am: 07f7e0c186 -s ours am skip reason: subject contains skip directive Change-Id: Ie6169bf4e759587c6abd593567e79b6507250b58
0 files changed, 0 insertions, 0 deletions