diff options
| author | Satoshi Kataoka <satok@google.com> | 2013-07-09 10:23:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-09 10:23:00 -0700 |
| commit | 8b95d259b9f66342ba5ae6e8f4ea262dcb1de05b (patch) | |
| tree | 5adf3795de27739aeab1f6c1ca6c4fc8c4f9014f /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 216e340b72375c5888d1023226582f75c1ed6b98 (diff) | |
| parent | b7925f2219480d4ddbb1c655b9b386ed031815a3 (diff) | |
am b7925f22: Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev
* commit 'b7925f2219480d4ddbb1c655b9b386ed031815a3':
Revert "Stop marking gamepads as keyboards"
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions