diff options
| author | Shanea King-Roberson <kingroberson@google.com> | 2015-02-10 20:25:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-10 20:25:34 +0000 |
| commit | accf0770306419773c3119eb32ca912077894b11 (patch) | |
| tree | 7d24ad6a791dac7788a29f462ab662ca3b7db27d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 449988872be61f273c91db13069d5b7172429032 (diff) | |
| parent | 696b68c4fc65b671a00cfa82e6bc29a7d665828e (diff) | |
am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
automerge: 696b68c
* commit '696b68c4fc65b671a00cfa82e6bc29a7d665828e':
Adding videos for 5.0 changes and watch face development.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions