summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-16 19:01:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-16 19:01:08 +0000
commit6de5e46ae829a4c5fddb1e3dc08bdfaa9c850d71 (patch)
tree622c9df27b985853678e5215268c4e8d760113f0 /java
parent7dfdc2284d8f45398cd5768d16eec0bac8b75ef5 (diff)
parent9de53ff92f0c4bdd4e8540775dc3213e98b1c7c1 (diff)
[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: f6b13b7304 am: 9de53ff92f -s ours
am skip reason: subject contains skip directive Change-Id: Ic48dd840bf18c5acdc57416ea0b938b0e450c426
Diffstat (limited to 'java')
0 files changed, 0 insertions, 0 deletions