diff options
| author | Zach Riggle <riggle@google.com> | 2015-09-17 22:42:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-17 22:42:18 +0000 |
| commit | 3c9ffc2d5ae7152ae8b303a7b3c8da0a2fc734cf (patch) | |
| tree | e4bbd9be6a778375c6bd268819ece11a8ea98453 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2f8ac2a35bbd81cd297d3ea3a1baaa554353e87e (diff) | |
| parent | 2ebcf2c28fd1657a98a7dc4a90bcbe7e78f296e9 (diff) | |
am 2ebcf2c2: am ad0acf1d: am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev
* commit '2ebcf2c28fd1657a98a7dc4a90bcbe7e78f296e9':
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions