diff options
author | Wink Saville <wink@google.com> | 2013-08-08 15:46:52 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-08 15:46:52 -0700 |
commit | 7c00be48fcb1986db14915beef549e925b5670d2 (patch) | |
tree | 8b7016b315de6e74ebb71b9a7d685a24b88a0bfe /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 81132d5197fd2eb022a5a5587fc2fb5354ec8b22 (diff) | |
parent | 55adb390bb96175db9abee3ead349a98b4dc4262 (diff) |
am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev
* commit '55adb390bb96175db9abee3ead349a98b4dc4262':
Have CaptivePortalTracker use gservices updateable provisioning urls.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions