diff options
| author | Jaewan Kim <jaewan@google.com> | 2018-01-24 17:41:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-01-24 17:41:49 +0000 |
| commit | 0c12a587d0c21d89e880f5790bc074ce3d9b5f24 (patch) | |
| tree | 72b76cc378a530f05c1ddb5762db69c16314cec8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d997d191edf668de177496e4e00e69d7d3c6b001 (diff) | |
| parent | 4099b6e6fefdeda90c670412cc4f330ab75f0005 (diff) | |
Merge changes from topics "public_browser2", "public_mediasession2"
* changes:
MediaSession2: Public APIs for MediaBrowser2 and MediaLibraryService2
MediaSession2: Public APIs for MediaSession2 and MediaController2
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions