diff options
| author | Kevin Hufnagle <khufnagle@google.com> | 2016-06-01 23:48:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-01 23:48:48 +0000 |
| commit | 86db54af759d8dc2d2c0d45dea786e2a1b94fd95 (patch) | |
| tree | bd82003ef9a9405a32f7543b1b72e7bfb9ea36d2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7ecce249e683353bf2eb4dd63402753519b7dd99 (diff) | |
| parent | 5735a69ac3468df2626328837188517b25b7bdee (diff) | |
Merge "cherry-pick: docs: Added note that <application> at end of manifest. am: d5368b8185 am: f5250c5b37 am: b04f86acae am: 8b1df8f382" into nyc-mr1-dev-plus-aosp
am: 5735a69ac3
* commit '5735a69ac3468df2626328837188517b25b7bdee':
Change-Id: I5b832528fb09cabc4904f1ba556252d376e76073
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions