diff options
| author | Todd Kennedy <toddke@google.com> | 2015-08-26 00:35:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-26 00:35:42 +0000 |
| commit | 81d0325ffe57c4a9296d84ded436d8fcff4b9201 (patch) | |
| tree | 8a9d42222976eeed14f2349736016db90a3a89b5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9b7a4ac5846baf2da8b800c24a770669cfa735aa (diff) | |
| parent | 5983ae7b98bbe16b8a0a5ffe9203baa1ed58a8fb (diff) | |
am 5983ae7b: Merge "Allow extra slop in battery stats" into mnc-dev
* commit '5983ae7b98bbe16b8a0a5ffe9203baa1ed58a8fb':
Allow extra slop in battery stats
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions