diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-08-03 21:45:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-03 21:45:29 +0000 |
| commit | 33bdfe75c7f7cab933ace382dcaa7d2c4d245dad (patch) | |
| tree | 007dd35eca5153c9633082f2ddfd0d4ea908b91b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b1e54abdbe3257999e017b972606996417a960a8 (diff) | |
| parent | df776b761dfd74d11fb4ccb4355a53a717694cc5 (diff) | |
am df776b76: am d985e3b6: Merge changes Ib5f53f3b,I7debf3ee,Ic494ee7f,Ia8d223ae,Iff7dbbf6 into mnc-dev
* commit 'df776b761dfd74d11fb4ccb4355a53a717694cc5':
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/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions