summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorFyodor Kupolov <fkupolov@google.com>2016-12-09 20:10:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-12-09 20:10:53 +0000
commitbc8940f42542c75f68abba0a7f860d0c812fbcd5 (patch)
treef5f7ab80b27f24e9fa791f96fff37081c57d8878 /tools/aapt2/diff/Diff.cpp
parentca9a29f1582d2ef5d6eb1d0cb19fa02312a49890 (diff)
parent2fe1990ba779ef3fdb77cc596ff9eefeaeef613d (diff)
[DO NOT MERGE] Increased user switch timeout to 3s
am: 2fe1990ba7 Change-Id: I0c33b2804fe41885c02567d3ed5208993b46086a
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions