diff options
| author | Colin Cross <ccross@android.com> | 2017-02-21 23:42:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-21 23:42:06 +0000 |
| commit | 56ff7d9e7384fbf09a73ee61120539b2aa0e1983 (patch) | |
| tree | 34d1940d27dcd887550d4eebc1c549033edae051 /tools/aapt2/diff/Diff.cpp | |
| parent | 8822f7f6e9c9fc7ecf97ff758d62b4bef5c38178 (diff) | |
| parent | cfbf2261651abba5822b4a2e0213427b298fcb63 (diff) | |
Merge "Revert "Remove outdated emulator check which causes BT to not start"" am: 375ea2ae71 am: ebc05de919
am: cfbf226165 -s ours
Change-Id: I278d5afab4e15535dd2fc7b3501f805934e58f28
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions