diff options
| author | John Spurlock <jspurlock@google.com> | 2014-09-29 20:48:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-29 20:48:15 +0000 |
| commit | 0bea72864e1129ef559744ab00e74b6215ef246c (patch) | |
| tree | f3f90285d503a02b3f347f0c461738020c033152 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0bb9d8327500c265c2efd82449db23421cd70d83 (diff) | |
| parent | e5238f7a8db90ebc0e8875adaff84efc198f0800 (diff) | |
am e5238f7a: Merge "DozeLog: Keep keyguard monitor alive, keep emer call stats." into lmp-dev
* commit 'e5238f7a8db90ebc0e8875adaff84efc198f0800':
DozeLog: Keep keyguard monitor alive, keep emer call stats.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions