diff options
| author | Scott Main <smain@google.com> | 2013-02-13 10:08:43 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-13 10:08:43 -0800 |
| commit | 3baf1b6f44c8f9f851e165f1b818a475b4b09fed (patch) | |
| tree | aeb1ddff88dd2aa4a9fb8467dd65e29fa20e9f40 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 45df16aa73c6665f55c86f4a9998e6b383b751ca (diff) | |
| parent | 60d8836e0dcd46645d73ef7fb34257aef5e5a927 (diff) | |
am 60d8836e: am be4d1dcd: am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '60d8836e0dcd46645d73ef7fb34257aef5e5a927':
docs: add info about secure adb
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions