diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-08-04 01:59:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-08-04 01:59:05 +0000 |
| commit | 08014f72b271477f3b62ad9b9fd3722e7f52378a (patch) | |
| tree | 190ebdfdea0bdabcb3836ad4a59d5ecfc1c94c25 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f655676fa4022e14fc6b9d11b191a288dcc386b1 (diff) | |
| parent | 4b4b77292f95542ac5211a61ca207c450ca7d82f (diff) | |
Merge changes from topic 'am-0f06d118b42d48c1a4fb10bba9b021d3' into nyc-mr1-dev-plus-aosp
* changes:
Merge "docs: Migrated "Android Runtime on Chrome" pages to DAC" into nyc-docs am: d6f1d8ea28 am: 0af74fa732 am: bc10c93a2b am: 0041789097
docs: Migrated "Android Runtime on Chrome" pages to DAC am: 684d849621 am: a007a4d772 am: 6ed6297b5c am: c78cb33f58
docs: Added page on DAC describing ARC manifest file considerations. am: 178caa888f am: ebd455b077 am: 22f5b5c5d4 am: 3a25089697
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions