diff options
author | Jerry Zhang <zhangjerry@google.com> | 2018-07-17 15:00:31 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-07-17 15:00:31 -0700 |
commit | db3a291e9daef78a03d71079d79673c1291630df (patch) | |
tree | b37082d0049dcdb91f0feec17cf9ec25002e7b93 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 7f05ea78dd63708c4c2b4dfe8eb3d9cec8f97255 (diff) | |
parent | 4bff76be8058a0c2948836b4fd01b35bb57e9f86 (diff) |
Merge "UsbDescriptor: Add finite timeout to control transfer" am: 20dca26f41
am: 4bff76be80
Change-Id: Ie89d8a02c4e92e4d7d2372fad29abdba0c2fc568
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions