summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-09-08 15:29:32 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-08 15:29:32 -0700
commitabeb36048b1a446af9861ce6541f1ffd191df08e (patch)
tree91240c54aeeb27b6beba74a667f54dda2907d5a4
parent59b02d36554f8cfb3297d95c630c3ea75555a139 (diff)
parent3a01ba25fdeb5266bba563e321bca7bd7b36553d (diff)
downloadUserDictionaryProvider-abeb36048b1a446af9861ce6541f1ffd191df08e.tar.gz
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 910a292f86 -s ours
am: 3a01ba25fd -s ours am skip reason: change_id Ia7ae30503ccd3358851e80258a450f8cd8030f52 with SHA1 59f15e90b8 is in history Change-Id: I12b7ca674fdcbc32a463bd725fbde741bd201bd8
0 files changed, 0 insertions, 0 deletions