diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-07-01 00:52:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-01 00:52:57 +0000 |
| commit | 4718afcd2e5d52638ba1c4f58b2db6aea01171de (patch) | |
| tree | 6d0d740ae2760eadd888d7d111b78aae161746e2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f6af305706e0ef4ed2ca303c2c7030c0a3580520 (diff) | |
| parent | 14b5701029edc4473921e2a2446ec3151f30b916 (diff) | |
am 14b57010: Merge "BatteryStats: Record cpu power usage from /proc/uid_cputime" into mnc-dev
* commit '14b5701029edc4473921e2a2446ec3151f30b916':
BatteryStats: Record cpu power usage from /proc/uid_cputime
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions