diff options
| author | Alan Viverette <alanv@google.com> | 2015-07-29 21:11:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 21:11:59 +0000 |
| commit | 176c878d8af4d6f610e77bd32d788c7d68cfbf3f (patch) | |
| tree | d359abd51fcaf4f94cab2a03cc20e3c08fe2a0fd /rs/java/android/renderscript/RenderScript.java | |
| parent | 4371922d13794726d5fb6917b6db07c13e6d7ae2 (diff) | |
| parent | fa37ee81ed80f0dc6eeeed2d9a89610dd967229a (diff) | |
am fa37ee81: am 93184eef: Merge "DO NOT MERGE: Don\'t backup night mode setting" into mnc-dev
* commit 'fa37ee81ed80f0dc6eeeed2d9a89610dd967229a':
DO NOT MERGE: Don't backup night mode setting
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions