diff options
| author | Makoto Onuki <omakoto@google.com> | 2016-05-12 17:24:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-12 17:24:12 +0000 |
| commit | 0ac2961dcb18ff9307d4882dd3247c0a863a0ee2 (patch) | |
| tree | acb43b2281addada39366a90d8aac1f2819be651 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 391dbbf0226360238740016e238581113d012112 (diff) | |
| parent | 26edcba2c950701ff2dd8794687552bc37e4dfc8 (diff) | |
Merge "Remove ShortcutManager" into nyc-dev
am: 26edcba2c9 -s ours
* commit '26edcba2c950701ff2dd8794687552bc37e4dfc8':
Remove ShortcutManager
Change-Id: I02f70f07d24d3c7f58036d4e1535020074a1d3f0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions