summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-07-02 16:17:35 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-07-02 16:17:35 -0700
commit893556a30636b3b7f30ba3569b1c0b873143322c (patch)
treeb0a6283cd22e708e154419ea9e007e3e4a4b7d09 /java
parent352860c501e0a023def3c66fe0f186494bc7abfc (diff)
parent983e4e28614acb8a7c207d305b58151d8775b873 (diff)
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 10074ae13c
am: 983e4e2861 -s ours am skip reason: subject contains skip directive Change-Id: I3267e64a00892e251b8dc4a181792ab056b54128
Diffstat (limited to 'java')
0 files changed, 0 insertions, 0 deletions