tree 281c14638b6d26679a882037ee5eec5fa71d3efc
parent 36f6eb68a196260d6d12c27e34fb1c1324fdd2c9
parent 4e2eb430ee39899bbbf78c49d2098dc4271f66e8
author Alex Light <allight@google.com> 1495501418 +0000
committer android-build-merger <android-build-merger@google.com> 1495501418 +0000

Merge "Deal with ASAN alloc-dealloc mismatch in class transformation code." am: 0b183409d8 am: a95ec49e01
am: 4e2eb430ee

Change-Id: Ie26a56cd0ab5f42ce47a42a28fe4cf1a91569c0a