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