diff options
author | Andre Eisenbach <eisenbach@google.com> | 2015-02-10 00:34:43 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-10 00:34:43 +0000 |
commit | 8f31fa81e0a79f51ceb301193a2c77ca7f619769 (patch) | |
tree | e19a56059f8e811c11a71e92e57c5d616948df7b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 24c02c418673a18a287ce0820f0024f7a18ff181 (diff) | |
parent | 3ca77ccf873f12e116a66d1c1a417fe89f75af85 (diff) |
am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
* commit '3ca77ccf873f12e116a66d1c1a417fe89f75af85':
Add API to check if a Bluetooth connection is encrypted (1/2)
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions