diff options
author | Greg Hackmann <ghackmann@google.com> | 2014-02-21 13:04:00 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-21 13:04:00 -0800 |
commit | 9e413bf4e562d98b6efeb157369f152edd5f0261 (patch) | |
tree | f926e8e3778fe5a711df1b8a585e23b936624c99 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | b2f07b27725bed9716114c46df2cf636eb366f6f (diff) | |
parent | bbfc08b3abc0934f67659f3238eb79dcac838c17 (diff) |
am bbfc08b3: Merge changes I6d4fdada,Ia34899a4
* commit 'bbfc08b3abc0934f67659f3238eb79dcac838c17':
open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
Move time setting code from SystemClock to AlarmManagerService
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions