diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-07-29 01:28:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 01:28:36 +0000 |
| commit | 2529d39d3184ab66207f3fde9f2106276a2c1c16 (patch) | |
| tree | 61e2459f32a8c8c41ea2e961f61672c74a55f433 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | da808d298e84288b63413d05c755c81f3c4826e1 (diff) | |
| parent | 858e4a6f89c6d2b09d65ccc6907aa357f7e3f125 (diff) | |
am 858e4a6f: am 9aae8d9c: am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev
* commit '858e4a6f89c6d2b09d65ccc6907aa357f7e3f125':
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