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