diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-09-22 22:09:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-09-22 22:09:13 +0000 |
| commit | f8033cb4f9df6ee6fac1deb9e9db3c1e8ede557e (patch) | |
| tree | 379fd80a57a4faab52fa52382a74899c2324220a /tools/aapt2/diff/Diff.cpp | |
| parent | 9e616e1db15839c73f4b87ca8cabdc8b12e87fb5 (diff) | |
| parent | 108d1eedb231b6463f686610b15f10afbf664b56 (diff) | |
Merge "Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 447ac4b31d am: 4431d6cb5b am: 852e5a43b9 -s ours am: a70fffe8e7 am: d677e8d413 am: 73607db5a1 am: 05cd9942d9 -s ours am: 745254f98b am: d91f2f4d2b am: c20376b2a0 am: 4a1b8d7aba" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions