| commit | 3dc082200a1f425ab579e2082c0d70eefa399b8b | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Fri May 01 03:52:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 01 03:52:10 2015 +0000 |
| tree | 5027231ab6e6c99c1ef4e1c3c10a4c7011a0d965 | |
| parent | e8a8440d70222750ad9b8563cbc80ca5c563b9c1 [diff] | |
| parent | b57f236e30d87bdfa69bb99e6b3f5ec6a3cc07c7 [diff] |
am b57f236e: Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev * commit 'b57f236e30d87bdfa69bb99e6b3f5ec6a3cc07c7': Add a hidden method to clear NetworkCapabilities. Fix javadoc error for requestNetwork. Simplify network callback handling code. Document and unhide CALLBACK_PRECHECK.