diff options
| author | Makoto Onuki <omakoto@google.com> | 2016-07-14 19:50:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-14 19:50:19 +0000 |
| commit | 599998e3b44df11035bbcf588eef83140bab93f7 (patch) | |
| tree | 6811dcfbb456630543d018ba36c56ad7a0a64e4e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a12eeeb4ef4fa1c6a07c984c334c83ecb373f05d (diff) | |
| parent | 267becf2cdfac32d122a788a5e09c473f5866709 (diff) | |
Merge \\"Don\\'t allow shortcuts with non-main activities\\" into nyc-mr1-dev am: e5b46f3bd5
am: 267becf2cd
Change-Id: I37d6ca7d9578f6862d50e262d402caf3f2337cb1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions