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