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