summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-08 04:47:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-08 04:47:00 +0000
commit3f044831020d9979f530b381c3ceb168e3d3b73e (patch)
tree8a98d7e550ce73c2e880ff73f8105accb104fda1 /tools/aapt2/diff/Diff.cpp
parentd1c0f8faacf4a23aa2dc2ea4260a03c07ef06035 (diff)
parente6d75258053917089d51a18b319ee5e3e98d7eed (diff)
Merge "[Settings] To avoid use APIs in IccCard directly, moving APIs into TelephonyManager." am: e6d7525805
Change-Id: I1187a4e4370db8e4b24aba7c012f765c3e6e9efb
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions