diff options
| author | Greg Hackmann <ghackmann@google.com> | 2014-02-22 00:46:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-22 00:46:52 +0000 |
| commit | 4418372b21e91f6d4b9e11931dd87a90a023d79e (patch) | |
| tree | e6a049cd2573e5e6160c1cb0febc9411fbc246bc /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 3b49a8a629fb66431bf320d0a759299c5383cb06 (diff) | |
| parent | 5f652b9fdfbcc279353955f7ef86b72d2ef9f5fb (diff) | |
am 5f652b9f: am 0cab896a: resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp
* commit '5f652b9fdfbcc279353955f7ef86b72d2ef9f5fb':
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/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions