diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-07-09 02:31:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 02:31:48 +0000 |
| commit | 2878e4e825bad10c5fe2784f0efb8bc545cdde53 (patch) | |
| tree | e55de482fc6a15982910d3fe6a2e144a9803d598 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fb5bccd5dbd5e515c1ddec740447155289cc34d4 (diff) | |
| parent | 8e82c794bb944d4a15501854721a476db2dae470 (diff) | |
am 8e82c794: am 3e2b53ff: am 1ad61b33: am 1549adb4: am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev
* commit '8e82c794bb944d4a15501854721a476db2dae470':
BatteryStats: Fail gracefully on corrupt battery stats
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions