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