summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2017-02-23 20:03:59 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-23 20:03:59 +0000
commitf171c39e53db087df4ac8ee1f3ff6ef818a5ca7e (patch)
tree6fcf789c408ed5156b50921d457e2b4351a6aedf /tools/aapt2/diff/Diff.cpp
parent7556690cf50ef3fdad266571e088a45618f90c1b (diff)
parent7c6b2f4d8bbebbe517675b3aa666d09186ad14c1 (diff)
DO NOT MERGE Relax isUserRunning check and allow in-profile calls am: a08c6a1cfb
am: 7c6b2f4d8b Change-Id: I18c2b795270260a02a117351fe5ca3ce5a5c0467
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions