diff options
author | Ruben Brunk <rubenbrunk@google.com> | 2015-06-06 00:17:13 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-06 00:17:13 +0000 |
commit | b31e547597d6ababd7186771d54e3fb5ef00ef80 (patch) | |
tree | fffae7720fd6e7eaf933ff3db83a29ae059a98be /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d40a83543a67a911b5dcfbb8d164cea0c5285a78 (diff) | |
parent | 8f955f89c2ff19aac7f3e009c825beda3618f630 (diff) |
am 8f955f89: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev
* commit '8f955f89c2ff19aac7f3e009c825beda3618f630':
Add UI for camera + flashlight battery reporting.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions