diff options
author | Jack He <siyuanh@google.com> | 2017-06-30 02:29:10 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-30 02:29:10 +0000 |
commit | 4429f9a68dccd5b92efcaed6078af67da85b067c (patch) | |
tree | 903f12c8c41bca10d03dc89a624e1ce3cb394207 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | e26118d84c10147b9a93ee20276003c3261486bd (diff) | |
parent | e269956acb34fc8a76451d3918732d6ffc3e8369 (diff) |
Merge "Add strings for battery level info of connected devices" into oc-dr1-dev
am: e269956acb
Change-Id: Iad81be953573a43e7ff5cffb06af5222f4e67322
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions