diff options
author | Alan Viverette <alanv@google.com> | 2015-07-29 20:58:38 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 20:58:38 +0000 |
commit | fa37ee81ed80f0dc6eeeed2d9a89610dd967229a (patch) | |
tree | 1715a8112d042e70d0b9f035c2eb3127ef7796b1 /rs/java/android/renderscript/Script.java | |
parent | 8e9b33f8fde3d96a7ced9817ce9357da4f1a7cff (diff) | |
parent | 93184eef410da6bb958d22e1dc90f3fddabc9369 (diff) |
am 93184eef: Merge "DO NOT MERGE: Don\'t backup night mode setting" into mnc-dev
* commit '93184eef410da6bb958d22e1dc90f3fddabc9369':
DO NOT MERGE: Don't backup night mode setting
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions