diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2016-06-14 01:38:24 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-14 01:38:24 +0000 |
| commit | 5a1428e81ab296df7468ca3e3347d175874e12c4 (patch) | |
| tree | 3518b252753cd90ae154992c58375bdceedc3ecd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e639245581d4119c9bda1462bf9efc6f6e30211a (diff) | |
| parent | 744888ed1bf52bfc85868d26252baac6b08fb77f (diff) | |
Merge \"Merge \\\\\"Correct parentActivity example in Activity Element docs.\\\\\" into mnc-io-docs am: 893413e50c am: ce2e9d8716 am: 3f1741a19c am: 0ea3ffd6c1\" into nyc-mr1-dev-plus-aosp
am: 744888ed1b
Change-Id: I6e879f62f035c2ec4874fe3fe5bdce7f3c7a5b20
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions