summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorSergey Volnov <volnov@google.com>2021-03-09 17:05:40 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-03-09 17:05:40 +0000
commit50f0175f3ed82670ca5d0b8f0da1f510217771b4 (patch)
tree614bee5c364cce0a4fa910ab5ef266c93a71bb09 /tools/aapt2/diff/Diff.cpp
parent8d90f15a4597ec820828e31920fa0f8ba1234e9c (diff)
parent82abc59b390eb0c88b1ecf8d201b6d056fae7ae5 (diff)
Merge "Allow shell to temporary change speech recognition service" am: aa212a0109 am: a7c55dc99e am: 82abc59b39
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1604913 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib6413ed4352ba6d967742063ab73b8e321f88dee
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions