diff options
| author | Makoto Onuki <omakoto@google.com> | 2016-06-24 21:47:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-24 21:47:54 +0000 |
| commit | a9d2a39bb1f2482b03bc8e8473d16b8471c5286e (patch) | |
| tree | 5c907f87f914aa7a495dccea00c43f297574cba0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 854036d55b9d09ebb8b6f5e0c482cdeef138e81e (diff) | |
| parent | 312933e0439f36dbfdb51dba14c6ef31fe94bfca (diff) | |
Merge \\"Shortcut: Only \\"main\\" activities can have shortcuts.\\" into nyc-mr1-dev am: 1af9a58956
am: 312933e043
Change-Id: I26419c323a33bf26f2dea4666e07c64a4e7d6254
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions