diff options
author | Andre Eisenbach <eisenbach@google.com> | 2015-02-10 00:42:55 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-10 00:42:55 +0000 |
commit | cd623416455100f64ef3f0be7ced27ffc04938a8 (patch) | |
tree | f0d818fb13baa5b2d64b773d42adbbf004778b01 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | a96869fc1323faa5989803c5235c4c28e1094a16 (diff) | |
parent | 8f31fa81e0a79f51ceb301193a2c77ca7f619769 (diff) |
am 8f31fa81: am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
* commit '8f31fa81e0a79f51ceb301193a2c77ca7f619769':
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