summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2019-04-17 16:03:48 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-04-17 16:03:48 -0700
commit81a974d1e899dac052a8a5ebfed21134a2150bc8 (patch)
tree4374d5c26463733b3e359d32d60bd8c354d8de72 /tools/aapt2/diff/Diff.cpp
parentc7ca36be34d2f0acd8bee93b55b335223805d466 (diff)
parent5ed91dd1cdb00f5dd97a15ae8d5c660de659710c (diff)
Merge "Revert "Add android.settings.ACTION_APP_BATTERY_SETTINGS to public API"" into qt-dev
am: 5ed91dd1cd Change-Id: I0fb2af0231f06b879bc4a1c08cd803460b7181f9
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions