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