diff options
| author | Adrian Roos <roosa@google.com> | 2015-07-14 20:01:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-14 20:01:15 +0000 |
| commit | 1d9a312c2c6a372071572fb32e10de19e67482d6 (patch) | |
| tree | fc97a0e4f5b0f88d8c25005a955547d93b331e53 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5edc6ffda765c51bbd97bd7ae6f1bd2082309dd2 (diff) | |
| parent | 3d2c298035c0d94f1bd590b04b5679f09b09f285 (diff) | |
am 3d2c2980: am a2231a75: am 9c013a21: Merge "Show charging speed on Keyguard" into mnc-dr-dev
* commit '3d2c298035c0d94f1bd590b04b5679f09b09f285':
Show charging speed on Keyguard
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions