diff options
| author | Adam Powell <adamp@google.com> | 2011-06-02 10:42:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-02 10:42:12 -0700 |
| commit | 74e51e26bfabad6a7e6afae3fb01ccdd259caa78 (patch) | |
| tree | 356d0fb8e9719e47ecc605036b044070b44a4f1c /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2a6627b9893ecce1c0db4c28a0c7e66ebaf5e3b9 (diff) | |
| parent | d31320d58fa3597962ed47d131aef6340beee4fa (diff) | |
am d31320d5: (-s ours) am 47dae694: am 7eba403e: Merge "DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2
* commit 'd31320d58fa3597962ed47d131aef6340beee4fa':
DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions