diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-07-01 01:06:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-01 01:06:31 +0000 |
| commit | 57a324033bcb348a9c0d4d4774f7d5ebb4b56a41 (patch) | |
| tree | 20cb445ca9076020e8d6f093f91ff4bd756573b8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3ac45a1c4ebdb537f83a78dd4c1550da4fb94d74 (diff) | |
| parent | 4718afcd2e5d52638ba1c4f58b2db6aea01171de (diff) | |
am 4718afcd: am 14b57010: Merge "BatteryStats: Record cpu power usage from /proc/uid_cputime" into mnc-dev
* commit '4718afcd2e5d52638ba1c4f58b2db6aea01171de':
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