commit | a8851ab1fb135b30339ab1b73dee40860453c5d7 | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Fri May 01 04:19:07 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 01 04:19:07 2015 +0000 |
tree | 13b5941f4e1a840e537bd392fa5d45366da36b70 | |
parent | 55819cc23509f6b0feec436bec7a1f7db0e2040c [diff] | |
parent | c5647c2edaaa3101c565cf12939179297a9dae48 [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.