diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-05-01 04:19:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-01 04:19:07 +0000 |
| commit | 0c12125e003b1d1b8dd6a2e0696f4f91571a7c25 (patch) | |
| tree | 45d105ecdcc77367f71b7e872c30e0f002ee61f1 /tools/aidl/generate_java.cpp | |
| parent | 043b26ba9adc1f8415ab8f6aac9e71d9ca66f898 (diff) | |
| parent | ad44d81457971085a0b20fb42388010d76c79132 (diff) | |
am ad44d814: am 3dc08220: am b57f236e: Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev
* commit 'ad44d81457971085a0b20fb42388010d76c79132':
Add a hidden method to clear NetworkCapabilities.
Fix javadoc error for requestNetwork.
Simplify network callback handling code.
Document and unhide CALLBACK_PRECHECK.
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions