diff options
| author | Elliott Hughes <enh@google.com> | 2020-07-22 18:32:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-22 18:32:12 +0000 |
| commit | f8f1f2caa0cc9d4ff9941a9ba112f1da46cf08aa (patch) | |
| tree | a652e10ab2ef76388a3a8f282cb668295e02ceb8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 307275ad3bfc907fd571cdf1cff27eb670a1e53d (diff) | |
| parent | 08407fefe5fabf8ec6ba7b057092a54f2c4da63c (diff) | |
[automerger skipped] Merge "Remove the watchdog's fd tracker." am: 4a724fc1ee am: ff2b9d5cb4 -s ours am: dfa3917c27 -s ours am: 08407fefe5 -s ours
am skip reason: Change-Id I86436f287d0e25d1dfae95b915beb78c88dccce2 with SHA-1 7adf08740f is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360733
Change-Id: Iff2a43b3d2ea03b5478aabf4fe65c5ba53147568
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions