diff options
| author | Selim Cinek <cinek@google.com> | 2016-05-24 20:16:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-24 20:16:16 +0000 |
| commit | 26431282ec5a25b94114c8acff38ba6178bb2c31 (patch) | |
| tree | 236ed50d30f066d114e2f73b4cbcc2d86e5e5358 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f03a50c4cb8b5e50a751dd7a8ac7bd80b27364e2 (diff) | |
| parent | a4400059a307adfea00a2ae3726949c802d4e2ad (diff) | |
Merge changes I7773ed3a,I73d97d9a into nyc-dev
am: a4400059a3
* commit 'a4400059a307adfea00a2ae3726949c802d4e2ad':
Process user events from service lifecycle callbacks.
Change-Id: Ia7436eba1886c9bd739cc3cda5029fd8caf0b109
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions