diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-05-01 04:04:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-01 04:04:03 +0000 |
| commit | ad44d81457971085a0b20fb42388010d76c79132 (patch) | |
| tree | ba7fea38d2a05a005ad2d4acbcfee7b2358939ac /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4816ebe8c2f312bca44d95abdfec0dba137c4fd4 (diff) | |
| parent | 3dc082200a1f425ab579e2082c0d70eefa399b8b (diff) | |
am 3dc08220: am b57f236e: Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev
* commit '3dc082200a1f425ab579e2082c0d70eefa399b8b':
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/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions