tree b6775e784db9bf68621f3d7dc5fb86144f6246b5
parent 2b5964ff0e56aea794958e70f2371f693ca9091c
parent 8431285728cf311c0494f02952378c6e68810f8f
author Pavel Labath <labath@google.com> 1499761247 +0000
committer android-build-merger <android-build-merger@google.com> 1499761247 +0000

Merge "sys_ptrace_test: Better detect missing HW support" am: fbefc86310
am: 8431285728

Change-Id: I49bd38960285f5522fcaa4c29ee5dc9da405b5b3