diff options
| author | Alan Viverette <alanv@google.com> | 2015-07-29 22:05:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 22:05:23 +0000 |
| commit | 2a5ac2e276dd24a79ab4c205da0f768892a6200e (patch) | |
| tree | 76aa8aa2711fba1d6972d0afaef96185d69dae1e /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 6086a25eb7721d7a59445796b73ee4c3f2e87701 (diff) | |
| parent | a4bfc36c558643ab25c5dae1622d9b476e5dc8b4 (diff) | |
am a4bfc36c: (-s ours) am d5406749: am 176c878d: am fa37ee81: am 93184eef: Merge "DO NOT MERGE: Don\'t backup night mode setting" into mnc-dev
* commit 'a4bfc36c558643ab25c5dae1622d9b476e5dc8b4':
DO NOT MERGE: Don't backup night mode setting
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions