diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2016-04-21 00:50:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-21 00:50:07 +0000 |
| commit | 051b810da60829c9dc0b4d50cf86c3631a0f8611 (patch) | |
| tree | 667c075d6fd8f4985556bee40874b3a81de9b8ab /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f153182db785ec45591d0a46815ab5463e8b143d (diff) | |
| parent | c708cf6340e623202e562992e6ef4062ace84cab (diff) | |
Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev
am: c708cf6340
* commit 'c708cf6340e623202e562992e6ef4062ace84cab':
BatteryStatsHelper: Include screen on baseline power draw
Change-Id: I6ba6f66ebc9d4ffebc8e6f5444957d0a345da4fd
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
