diff options
| author | Jeff Brown <jeffbrown@google.com> | 2015-03-20 22:10:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-20 22:10:54 +0000 |
| commit | 619ce1ce534775ab0ff4d591a69dafd53c04a315 (patch) | |
| tree | 6f72baf867d4c97746fe3c8fe2baa73bd470924f /rs/java/android/renderscript/RenderScript.java | |
| parent | 104a29b6b5fe6e454787053ca72950dbbc4d424b (diff) | |
| parent | d62163055f983b95a954f1a6c2cbc8e0085a7ab5 (diff) | |
am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
* commit 'd62163055f983b95a954f1a6c2cbc8e0085a7ab5':
Disable more hotkeys while in setup.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions