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