diff options
author | Julius D'souza <jdsouza@google.com> | 2017-01-04 23:20:43 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-01-04 23:20:43 +0000 |
commit | 7e2db40e5d065f8f9185dcbb026e62249bb16e4c (patch) | |
tree | 6716859b8e829ac20af1c7bb527690e7a27b9f21 /rs/java/android/renderscript/ScriptC.java | |
parent | 91af136305a24c760e338e509b52fdb4475b3a71 (diff) | |
parent | c0177f877288752b3b0a6210a9c9cdac74865d43 (diff) |
Merge "Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev am: b60eb1a854 am: d559cb8124" into nyc-mr2-dev-plus-aosp
am: c0177f8772 -s ours
Change-Id: I797513f3072baf1e77ea502f2b03c0de734eb232
Diffstat (limited to 'rs/java/android/renderscript/ScriptC.java')
0 files changed, 0 insertions, 0 deletions