diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-06-05 18:11:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-05 18:11:09 +0000 |
| commit | 46150afcb305c4170f6a671cacd49807a40dd828 (patch) | |
| tree | 348600e62fb9f82a59a899d88106c3052f06675c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 528fa948031f3192e113ce2858bd1bfb652e4255 (diff) | |
| parent | 54376bbd4bf2d899982d1e38cf5e4f5e947b02ff (diff) | |
Merge "DO NOT MERGE: AAPT2: Allow undefined resources (placeholders)" into oc-dev am: 2f84c4715d
am: 54376bbd4b -s ours
Change-Id: I112b98965ed2004b1ef4ff19c7772b4ce10c4702
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions