| commit | d9d0e05e5482f64027692a80f5256d8b13ff8b6e | [log] [tgz] |
|---|---|---|
| author | Evgenii Stepanov <eugenis@google.com> | Fri Jul 01 20:33:01 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 01 20:33:01 2016 +0000 |
| tree | 6eaf46c3314aadf3898567818b1dbcfe7fb8528f | |
| parent | 58b782cd88a976fb417fa986b41d30e5d55b7895 [diff] | |
| parent | 39b8b7882209010f3c47610f13c62051d78ecad1 [diff] |
Merge \\\\"Apply SANITIZE_TARGET and LOCAL_SANITIZE when both are present.\\\\" am: 9c88e0bfa2 am: 120112ee23 am: 6902905f37 am: 39b8b78822 Change-Id: Ie9769709f01223c931d6708e8013e1115babb01c