diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-07-29 00:41:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 00:41:03 +0000 |
| commit | 9aae8d9c1b2219f9d98ac07b1fe04ef62c4cacb9 (patch) | |
| tree | a3d64e29c31b51f1053f9e41dcd96204b86625ab /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ea0ad97949706d63e9fc0088e1e851d2dc91a2c1 (diff) | |
| parent | c96e6f19937ac36c8147a52863a43b35895aeb0b (diff) | |
am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev
* commit 'c96e6f19937ac36c8147a52863a43b35895aeb0b':
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