diff options
author | Joshua Duong <joshuaduong@google.com> | 2020-02-26 21:39:39 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-02-26 21:39:39 +0000 |
commit | be0d76d3823d12e5881fb999448c6eae971b913e (patch) | |
tree | 56218e6b521cf1040387c625ce2d2c78c509239e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 32f87fc6fbd1c707233cd355bbfe61af6bfcf484 (diff) | |
parent | eb6e5bc47b7a16855b590f6dccb719ea78a2dab7 (diff) |
Merge changes I36c6ef4b,I3c31394e
* changes:
Allow UsbDeviceManager to start adbd again.
Remove key from adb_keys if user forgets the key.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions