diff options
| author | Jens Ole Lauridsen <jlauridsen@google.com> | 2015-08-27 01:30:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 01:30:43 +0000 |
| commit | 7f795d16e1207eced6fbb48e889da49105a0b8b5 (patch) | |
| tree | b4ebaef7d244fea19973aae7d7595eb6ad1f8920 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1df73c5bef6dd20e1b3a0dd79f9e56a4a1609e6d (diff) | |
| parent | 413d41aac4d573ad4f0270c0fefd94ef4e864225 (diff) | |
am 413d41aa: (-s ours) am 67b73b60: am cd4d5b3f: Support AppBar from Material Design. [DO NOT MERGE]
* commit '413d41aac4d573ad4f0270c0fefd94ef4e864225':
Support AppBar from Material Design. [DO NOT MERGE]
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions