diff options
author | Adam Lesinski <adamlesinski@google.com> | 2015-06-27 00:51:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-27 00:51:48 +0000 |
commit | f45963dd195c4c5b7dc004fb256d5cb6f5f30a0f (patch) | |
tree | 0348896409838c518ad48ba7ff607553886affb0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 7253271b4cd9c0b356f3b7233e6eb2ff27693e7e (diff) | |
parent | e69e4e1a3ae3a2c1dd71c0eff3660d4369f0a159 (diff) |
am e69e4e1a: Merge "BatteryStats: Record suspend abort reasons" into mnc-dev
* commit 'e69e4e1a3ae3a2c1dd71c0eff3660d4369f0a159':
BatteryStats: Record suspend abort reasons
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions