diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-07-21 19:54:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-21 19:54:24 +0000 |
| commit | ca34b18481084b67fc690ee9c64301f785756dde (patch) | |
| tree | 7e75a5d544086699cfc6e85573e43ab1aecb7a2b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 22fac49a7be4e51de31287156885aa76a568c979 (diff) | |
| parent | a50f43e0028ec174827e73d1e45666b8e694808f (diff) | |
am a50f43e0: am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev
* commit 'a50f43e0028ec174827e73d1e45666b8e694808f':
BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions