diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-07-25 16:36:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-25 16:36:22 +0000 |
| commit | 6593daa39eaf71785cdf68f3899b69f8f6010046 (patch) | |
| tree | ff951bc7b56eaa4ba3a471b3fde15f71c932de57 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 25fcf1994c24954d34608ade2ee8fb2212e5e9d1 (diff) | |
| parent | a758499ee2c981eb2000661678860da68f2f9de2 (diff) | |
am a758499e: am d92a3957: am eee604ff: am 2a493532: Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev
* commit 'a758499ee2c981eb2000661678860da68f2f9de2':
BatteryStats: Decode wakeup reasons in Java
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions