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