diff options
| author | George Mount <mount@google.com> | 2016-06-03 23:27:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 23:27:31 +0000 |
| commit | 579a1e973f2686b424af59ad37bfbc62557bbd9f (patch) | |
| tree | 328993c25ea473cde0917461fc47169c36abab4d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 12a11215b2c7d6c274056a4c39f48132ee160b42 (diff) | |
| parent | 3af59ef42c83fbe4bf9e54f807597bddc6aa7ecd (diff) | |
Merge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev
am: 3af59ef42c
* commit '3af59ef42c83fbe4bf9e54f807597bddc6aa7ecd':
Internal API for cross-task Activity used by assistant.
Change-Id: Idb8c49437ff7d151e186edd2112e4def8d7a7e15
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions