diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-07-21 20:08:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-21 20:08:37 +0000 |
| commit | e1cd38e9298f0a62418e95adee64e5f2d7e36297 (patch) | |
| tree | e35075e258fa9aac3136a29f2651ac1746ea4343 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8f9a223e2f9601d579a47c93efcd92772ee0c405 (diff) | |
| parent | ca34b18481084b67fc690ee9c64301f785756dde (diff) | |
am ca34b184: am a50f43e0: am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev
* commit 'ca34b18481084b67fc690ee9c64301f785756dde':
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