diff options
| author | Adam Powell <adamp@google.com> | 2015-06-15 20:02:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-15 20:02:03 +0000 |
| commit | 256bd8b02c173359f0235dfa6a7720900c41eedc (patch) | |
| tree | 35260972de49482bfd2d6058adf5b0c0e2128e2e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 683a077798a91bb1e4bf63793e7c0d86f765bd2b (diff) | |
| parent | e032baa9fc8a0f85474c854ff6181bd160f8289b (diff) | |
am e032baa9: am b05ef5e4: am 417018f2: Merge "Only read foreground attr for FrameLayouts for targetSdkVersion < M" into mnc-dev
* commit 'e032baa9fc8a0f85474c854ff6181bd160f8289b':
Only read foreground attr for FrameLayouts for targetSdkVersion < M
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions