tree e22bfd8ee0a10f6009517b0cdf9dcd1787c75a6b
parent f6febf77e0dd98158959fb51ea905a3a567c4f2b
parent ca7da2b2a6779e138918c45bee0867f3ed2494ff
author Mathieu Chartier <mathieuc@google.com> 1497990382 +0000
committer android-build-merger <android-build-merger@google.com> 1497990382 +0000

Merge "Merge "Disable activity leak detection by default for userdebug" into oc-dev am: 956ea5f09d" into oc-dr1-dev
am: ca7da2b2a6

Change-Id: Ifd2e105de6964dd5402b6174b71de45216f3bf6b