summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorDmitry Dementyev <dementyev@google.com>2019-07-23 22:07:17 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-07-23 22:07:17 -0700
commitab5cfd403d3b57b1862aa63f3694d6299841f519 (patch)
treef43d1725f3e7984cdf2c2f72abc26bdb960861cf /tools/aapt2/diff/Diff.cpp
parente1e3273b10c53a618483c8f96075effe51a6b033 (diff)
parent90d148f6b6a2186f8118d26236bd47cfea2c4070 (diff)
Merge "Tell KeyStore to ignore caller uid for PlatformKeyManager's keys." into qt-r1-dev am: f7ed4da59c am: 0aa504ec23
am: 90d148f6b6 Change-Id: I615280fee23c4bd611ab72d803ba2dafaeee2303
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions