diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2015-05-01 03:45:12 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-01 03:45:14 +0000 |
commit | b57f236e30d87bdfa69bb99e6b3f5ec6a3cc07c7 (patch) | |
tree | 3ba6063b4483f72838d855cd13de420183dfd0e0 /include | |
parent | f12071222fcf7c762bb8d28800ae693ec58347f4 (diff) | |
parent | f7058f5d1d9df1c5c49b06d8693a49e36ce358ca (diff) | |
download | frameworks_base-b57f236e30d87bdfa69bb99e6b3f5ec6a3cc07c7.zip frameworks_base-b57f236e30d87bdfa69bb99e6b3f5ec6a3cc07c7.tar.gz frameworks_base-b57f236e30d87bdfa69bb99e6b3f5ec6a3cc07c7.tar.bz2 |
Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev
* changes:
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 'include')
0 files changed, 0 insertions, 0 deletions