diff options
| author | Craig Mautner <cmautner@google.com> | 2012-11-13 10:04:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-13 10:04:27 -0800 |
| commit | 50acd73173e5ca68db0a4cc01e75a2faef86b2fb (patch) | |
| tree | 8fe38b1c279560ad3893b8d0ecd2e4714a3cf59f /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8a96ab8f312a24d7debaa5eae8d904599bb4a7a3 (diff) | |
| parent | 67a3fb6f3b787f0151c7f76f0c19dd1c8b80ae4e (diff) | |
am 67a3fb6f: am c10914ca: Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev
* commit '67a3fb6f3b787f0151c7f76f0c19dd1c8b80ae4e':
Support Wifi display devices that rename themselves.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions