diff options
| author | Alan Viverette <alanv@google.com> | 2015-07-29 21:34:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 21:34:50 +0000 |
| commit | a4bfc36c558643ab25c5dae1622d9b476e5dc8b4 (patch) | |
| tree | a5b42adaa316006367cdfda626fde96d8b6f731a /rs/java/android/renderscript/Script.java | |
| parent | 5334b265af71a31b0cf428b97b437ac040c067dc (diff) | |
| parent | d54067499371ffb007d006344bd95497d1497c6f (diff) | |
am d5406749: am 176c878d: am fa37ee81: am 93184eef: Merge "DO NOT MERGE: Don\'t backup night mode setting" into mnc-dev
* commit 'd54067499371ffb007d006344bd95497d1497c6f':
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