| commit | 18907025a63030cc5f41c1c19b35593687cc6a3d | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Sat Sep 19 19:55:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 19 19:55:53 2015 +0000 |
| tree | df7aac540ef778e11f3984d69435f65b09cf9fb6 | |
| parent | 4ac51de845d2b93a19b2e08a544d6800862807dd [diff] | |
| parent | d1ddf29901aef92e53e420e9937e9a4937569b9d [diff] |
am d1ddf299: resolved conflicts for 5b5c81c4 to stage-aosp-master * commit 'd1ddf29901aef92e53e420e9937e9a4937569b9d': asan: update condition to work with multiple SANITIZE_TARGET values.