diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-08-03 22:08:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-03 22:08:16 +0000 |
| commit | 8f5fa3a6a63c65ea3f73da3488b7cdf888313e1f (patch) | |
| tree | 024c2d28bdbcd3b8130354ad1ed0e132cd687d46 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | f117001dfa1eb4f02114f6cb1501f730e20bb191 (diff) | |
| parent | 534d9485f2fad985791e947a7b8ba7dff92268c6 (diff) | |
am 534d9485: am e92b2645: am 33bdfe75: am df776b76: am d985e3b6: Merge changes Ib5f53f3b,I7debf3ee,Ic494ee7f,Ia8d223ae,Iff7dbbf6 into mnc-dev
* commit '534d9485f2fad985791e947a7b8ba7dff92268c6':
Revert to using AppTheme for LayoutLib tests.
Fix Matrix_Delegate.native_getValues()
Update test image for upated nav icons.
Fix typo: s/FullScreen/Fullscreen/ in LayoutLib.
Fix bugs introduced in 78aa664.
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions