diff options
author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-06-05 18:11:58 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-05 18:12:03 +0000 |
commit | 1598dc532708fa815562547f8e372d013a4d492c (patch) | |
tree | bd79cd3b5c0e2caae387fcce740f5d547e4314a6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 4eee2e09cc9a4dc330e7d7d72ab647b643b3b9ab (diff) | |
parent | 46150afcb305c4170f6a671cacd49807a40dd828 (diff) |
Merge "Merge "DO NOT MERGE: AAPT2: Allow undefined resources (placeholders)" into oc-dev am: 2f84c4715d am: 54376bbd4b -s ours"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions