diff options
| author | Nikolas Bravo <ngbravo@google.com> | 2017-07-13 20:20:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-13 20:20:57 +0000 |
| commit | 8af5f7c440eb9898e05c52b4854c329cd366a6ad (patch) | |
| tree | 0f07dbfd24e090f6b2d27989fb8fbdc3057f4871 /rs/java/android/renderscript/ProgramFragment.java | |
| parent | f003ae0f255c7d3765ffd9abfb787cf408c3fa15 (diff) | |
| parent | de93e6912f299b00949c9eae7ba4c97a63f852fc (diff) | |
Merge "ProfileSelectDialog no longer removes caller activity from task." into oc-dr1-dev am: 479d915db5
am: de93e6912f
Change-Id: I861c5f7d4527d297e8049fbd6fddb3a5f96248fc
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragment.java')
0 files changed, 0 insertions, 0 deletions