diff options
| author | Adrian Roos <roosa@google.com> | 2015-07-14 19:31:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-14 19:31:47 +0000 |
| commit | a2231a754b92eb79e4b667c8b40fd0390ebb6dfb (patch) | |
| tree | c718568c2486982f1a146d79c4797992f9cc370b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 779e5e0ed8489fe6faad35a061a82ad07618b5b3 (diff) | |
| parent | 9c013a211768c661f1142aba31c690daa76c66f7 (diff) | |
am 9c013a21: Merge "Show charging speed on Keyguard" into mnc-dr-dev
* commit '9c013a211768c661f1142aba31c690daa76c66f7':
Show charging speed on Keyguard
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions