diff options
author | Jakub Pawlowski <jpawlowski@google.com> | 2017-09-14 15:04:57 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-14 15:04:57 +0000 |
commit | 1561634027252c93eeca14cb5ae430641f53ceeb (patch) | |
tree | 505136e60d77a7272d33240fe7ea96a7e7b587d5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b8f7864585440a2f8ffdcd6394a1e95904edde6f (diff) | |
parent | d9ad6fc11a57babba4cccc234cca0a00ba69d2e1 (diff) |
Merge "Bluetooth: fix GATT race conditions when using Handler" into oc-mr1-dev
am: d9ad6fc11a -s ours
Change-Id: Ia63cd9cb3c0f2084890d8713e397f64435c6079d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions