| commit | 6902905f37dc6f715f5ebb2011a943b78ab8a8cf | [log] [tgz] |
|---|---|---|
| author | Evgenii Stepanov <eugenis@google.com> | Fri Jul 01 20:22:37 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 01 20:22:37 2016 +0000 |
| tree | 7661d98579295421f0baf9967721cc7566ea562c | |
| parent | 5a88a4c1e843e7bd3d0bc2103b65f0fa171f0021 [diff] | |
| parent | 120112ee23f16ba3508427dd9b9b89e397a49809 [diff] |
Merge \\"Apply SANITIZE_TARGET and LOCAL_SANITIZE when both are present.\\" am: 9c88e0bfa2 am: 120112ee23 Change-Id: I126d080bf84cf049d6f7f8de1881e4f89e057561