diff options
| author | Paul Jensen <pauljensen@google.com> | 2015-06-20 01:20:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-20 01:20:59 +0000 |
| commit | ae6d0354677221fb988a76f2f26c064c167283da (patch) | |
| tree | 69281dd595fe0b20d247e798629b9847f6b3b875 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4a451de00bbb8b2a91689f383bf1b52c6cb5f918 (diff) | |
| parent | 2f56a33041b95fc9badcf08e8be4fd57eec56ccb (diff) | |
am 2f56a330: Merge "Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)" into mnc-dev
* commit '2f56a33041b95fc9badcf08e8be4fd57eec56ccb':
Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions