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