diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-12-16 01:53:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-16 01:53:14 +0000 |
| commit | 306f0eb669a64d0fdadc8923168e7c586bfa5c2a (patch) | |
| tree | eac08352ad7ccae501579c3c3641d3275374a0ed /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d2e1ee09d0e569ccf41d7bda88da681a976fd33f (diff) | |
| parent | 22bfb75ebb949ff05d34ad22fbcc888582aaaaa4 (diff) | |
am 22bfb75e: am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices" into lmp-mr1-dev automerge: 465d123
* commit '22bfb75ebb949ff05d34ad22fbcc888582aaaaa4':
AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions