tree 965ba73c6b95f34fd2d3d76c85ab7368efa98ec6
parent 8ef7a895daf7106417386675de61f63bc8475bf8
parent 5d95b4aa935e37fee0f68a97953c6e440974af0d
author Ying Wang <wangying@android.com> 1446494476 +0000
committer android-build-merger <android-build-merger@google.com> 1446494476 +0000

Merge "Add _asan suffix to ro.build.flavor for ASAN builds." am: f0a8dd43b2 am: cce30b6daa
am: 5d95b4aa93

* commit '5d95b4aa935e37fee0f68a97953c6e440974af0d':
  Add _asan suffix to ro.build.flavor for ASAN builds.