diff options
| author | Bryan Mawhinney <bryanmawhinney@google.com> | 2016-07-20 19:13:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-20 19:13:04 +0000 |
| commit | 642e50621ae1e04c98d6d9c15c42309e0196921a (patch) | |
| tree | 0fc50752dfd3c5a60ddb8c57b5358d039af24931 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 49bcc5dd80429ecfa1d518eef3726f83f4cb85d6 (diff) | |
| parent | 881bc352ee342c69d762ddf8c9edf16f1862c715 (diff) | |
Merge \"Add .mov to MediaScanner video file types\" into nyc-mr1-dev
am: 881bc352ee
Change-Id: I323e40003c87b2b892b1cb0712507cabc7b1d1d5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions