summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorFyodor Kupolov <fkupolov@google.com>2016-06-18 02:07:49 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-18 02:07:49 +0000
commitcf9c82b124c1a544b6df19bface5645d437555c0 (patch)
tree82bcc7f203b34dca33991eb6e83093e1f6165f9b /tools/aapt2/diff/Diff.cpp
parentf746a1be2f905ec0a55f7d8230b8ef7d9b542e2e (diff)
parent1f0151220e8c3054e826d2c89056bb3aeaf6542e (diff)
Merge \"Do not schedule restarts if the system is shutting down\" into nyc-dev
am: 1f0151220e Change-Id: I34df39f82516cb0e40c12a25340a7b3bb2c5f65a
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions