diff options
author | Justin Koh <justinkoh@google.com> | 2014-06-10 01:30:16 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-10 01:30:16 +0000 |
commit | 36b0cae9556c2498785f502b4a2004fbdd82d983 (patch) | |
tree | 03f723966e4a3eab1fda0c79a5f34948719fc69b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 55762575b02a2cfb43135e14445e4d285323c9a9 (diff) | |
parent | 2be4ddc403b55e3c5107609a2eaeed4ddc0f23f0 (diff) |
am 2be4ddc4: am a5de8479: Merge "Fix Browser when running on a platform without webview" into klp-modular-dev
* commit '2be4ddc403b55e3c5107609a2eaeed4ddc0f23f0':
Fix Browser when running on a platform without webview
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions