tree c69000baa49582f3a7d679318690043bb632e807
parent bd5d7210621849160bb05902a06a21ed971033e5
parent 956ea5f09de8d6a977ed0b26f3914ed2ffd9d588
author Mathieu Chartier <mathieuc@google.com> 1497989192 +0000
committer android-build-merger <android-build-merger@google.com> 1497989192 +0000

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

Change-Id: I71d5feb7f558347ddb21dc53e7a7d5b9eda9db6d