diff options
| author | Esteban Talavera <etalavera@google.com> | 2015-07-14 16:50:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-14 16:50:35 +0000 |
| commit | e1f7a9ff7b764e2876eaf87da7f3204bbb0a764e (patch) | |
| tree | 85b620739b3f1b6c5a6e44c380cdc664bb72cf35 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | f27decd439bab93668a9a9a1d884af5b0694092b (diff) | |
| parent | ffded0dd94581c8c20701295d66083ac4dfd1e80 (diff) | |
am ffded0dd: am d943ac7d: am 8dd280c2: am f463ac66: am 0ec43f89: Merge "Use correct user when filtering app link candidates" into mnc-dev
* commit 'ffded0dd94581c8c20701295d66083ac4dfd1e80':
Use correct user when filtering app link candidates
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions