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