summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorWale Ogunwale <ogunwale@google.com>2016-06-20 23:08:12 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-20 23:08:12 +0000
commit87ca3c1fa547c20b161872f400f077a69ca0eeec (patch)
tree16b10720aae1a809890ee85fdc93643e901a0f3f /tools/aapt2/diff/Diff.cpp
parent2beba073d1666ff335f4fa14fbf4c5fd9db010a2 (diff)
parentf159b74608f76433a4e4ee563e13f7fa38ea559c (diff)
Merge \"Don\'t re-launch stopped activities while the device is sleeping\" into nyc-dev
am: f159b74608 Change-Id: Iaf6cdfd3e6b7ec6a1e1d37cc200b196d105f1ef7
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions