diff options
| author | Nick Armstrong-Crews <strongarm@google.com> | 2015-09-08 04:35:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-08 04:35:36 +0000 |
| commit | 36afc2b76743b2b2803da20dc6a8b2142d1f9b17 (patch) | |
| tree | 85166808b2f2ce4598807277e2c961e32bcca0e0 /rs/java/android/renderscript/ProgramStore.java | |
| parent | 953c6a4a53715bd7e88dad78814110709bf7bf7f (diff) | |
| parent | 9b8f82a3a073891965a962251f9e613ba8cc90bb (diff) | |
am 9b8f82a3: Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev
* commit '9b8f82a3a073891965a962251f9e613ba8cc90bb':
Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions