diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-07-29 02:10:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 02:10:51 +0000 |
| commit | 7ca82d915ea92ef74e21a7abb332d74e5fd26a9c (patch) | |
| tree | 8562adb23da30b8a6c586745d73e2a1afc38a2bd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 810796ca6a741dc3a4afb9015ac46c97049b58be (diff) | |
| parent | 2a098fe90ab0e60c2326e9aedbfdd85529de782f (diff) | |
am 2a098fe9: am 2529d39d: am 858e4a6f: am 9aae8d9c: am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev
* commit '2a098fe90ab0e60c2326e9aedbfdd85529de782f':
BatteryStats: Use proper power calculator when energy data is received
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions