diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-07-14 20:37:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-14 20:37:23 +0000 |
| commit | 36ba8b1b4c0822036b4652d3e134979fae89c54d (patch) | |
| tree | a7034dab73b1be076f712a3f1630ba2e5caf4884 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 33e81df742f2fa7166399d893eb01e8c41a8780c (diff) | |
| parent | ba7e39d53a49a1a86d5ec1b5ce66ce56b30c7e66 (diff) | |
am ba7e39d5: am 92a3914f: Merge "BatteryStats: Remove uid_cputime Slog.wtf for high cpu times" into mnc-dev
* commit 'ba7e39d53a49a1a86d5ec1b5ce66ce56b30c7e66':
BatteryStats: Remove uid_cputime Slog.wtf for high cpu times
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions