OSDN Git Service

am 3dc08220: am b57f236e: Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into...
authorLorenzo Colitti <lorenzo@google.com>
Fri, 1 May 2015 04:04:03 +0000 (04:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 1 May 2015 04:04:03 +0000 (04:04 +0000)
commitad44d81457971085a0b20fb42388010d76c79132
treeba7fea38d2a05a005ad2d4acbcfee7b2358939ac
parent4816ebe8c2f312bca44d95abdfec0dba137c4fd4
parent3dc082200a1f425ab579e2082c0d70eefa399b8b
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.