diff options
| author | Greg Hackmann <ghackmann@google.com> | 2016-05-28 16:41:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-28 16:41:13 +0000 |
| commit | f11d0fe8c5a0906a7b6295adea9da1d544a3a22d (patch) | |
| tree | 2ee05bfab6f5606ce9dfd3c1ba35f3690bf245b0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 10b673c2345f2d2aa7b2c5983f2e18b35d694ce1 (diff) | |
| parent | 359a4d9569fd88a896650065256e8a377546b8e2 (diff) | |
Merge "Revert "AlarmManagerService: remove legacy /dev/alarm support"" am: 6fb921a61b
am: 359a4d9569
* commit '359a4d9569fd88a896650065256e8a377546b8e2':
Revert "AlarmManagerService: remove legacy /dev/alarm support"
Change-Id: I0f1ed806b1261796da0dad770c50e8e1b9f5b3e1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions