diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-02-04 09:07:20 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-04 09:07:20 -0800 |
| commit | 86f962159a0cc3c5b56d7fcf8d4187eefd5f4442 (patch) | |
| tree | 4584141d8db8967cd8b031938ba3185fa6773a4e /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 23becda5d008bfe64a9b101e6967d96d4ece8d0e (diff) | |
| parent | 29c40abf9eaa6ed5af6100616cf9cf91a47bc477 (diff) | |
am 29c40abf: am 18e9a79f: am 120f7eb5: am e929e661: Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '29c40abf9eaa6ed5af6100616cf9cf91a47bc477':
Doc change: Remove proto scheme from src urls (fix mixed content warning).
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions