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