summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-02-21 23:32:32 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-21 23:32:32 +0000
commitebc05de919ed4b33f8331b2497f448a43f336c6f (patch)
tree8deb40bd322e22e8f165eb0656153b8315917403 /tools/aapt2/diff/Diff.cpp
parent50bc658e2085da79637f1dbb6570b8afe2f75766 (diff)
parent375ea2ae7111d50744f8d06a1db201cadcb4d075 (diff)
Merge "Revert "Remove outdated emulator check which causes BT to not start""
am: 375ea2ae71 Change-Id: I3d5abc52abf3f7c01ba4fbee47d7e487e99f5dda
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions