summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2015-08-06 14:05:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-06 14:05:17 +0000
commit43a95cf1cdf5cd62b81af3222d194a0873ad6933 (patch)
treec0d15bb095f390b8c1539c081b21d8cabbb31215 /tools/aapt2/diff/Diff.cpp
parent48d146c9d66abd3002a8bc6b7245e4c34b6fcff5 (diff)
parent44a14ef7b4b5e85bb79c954f99929ec309c42c2e (diff)
am 44a14ef7: am eb7e3d7e: Merge "Don\'t dispatch when non-interactive and the display is off." into mnc-dev
* commit '44a14ef7b4b5e85bb79c954f99929ec309c42c2e': Don't dispatch when non-interactive and the display is off.
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions