diff options
| author | George Mount <mount@google.com> | 2016-06-04 00:10:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-04 00:10:35 +0000 |
| commit | a9e1ad04fb27f101f62dacf35771671651204423 (patch) | |
| tree | 7f81be539755726ebf95d0fcd9ed394828b7c57e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c4b5996d105208dd404e9789c74f77a29da8c9c2 (diff) | |
| parent | 74babe679b0f8e17ed73280b18bc19153764c55e (diff) | |
Merge "Merge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev am: 3af59ef42c" into nyc-mr1-dev-plus-aosp
am: 74babe679b
* commit '74babe679b0f8e17ed73280b18bc19153764c55e':
Internal API for cross-task Activity used by assistant.
Change-Id: I985c67a465e88f74e66600709c187c3dfc9734e9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions