diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-07-27 21:17:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-27 21:17:38 +0000 |
| commit | deabddb34ea60f1c1e29d88e0c39165d565a3f22 (patch) | |
| tree | 08011bead28d726d37ee7df97ba237728d117746 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4cfa238971fe97b0e5e3bbe5d456de93c6d31788 (diff) | |
| parent | d07d8446dfb9f648a6027a7a35f34781eba51dcc (diff) | |
am d07d8446: am 62fbfcd9: am d7f4a078: am 48a90091: am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev
* commit 'd07d8446dfb9f648a6027a7a35f34781eba51dcc':
BatteryStats: Prevent BatteryService from blocking
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions