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