OSDN Git Service

Merge "Revert "Add a test exercising ptrace watchpoint functionality"" into nyc-dev...
authorPavel Labath <labath@google.com>
Tue, 3 May 2016 17:21:39 +0000 (17:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 May 2016 17:21:39 +0000 (17:21 +0000)
commit0e81e62a899bebdaff6c86c7e3015cee27094cf5
tree6ccd87eca38a8d81e67c680461658de9a4bb6836
parentc5e34c971db85f43923577e93daeed5b846d5359
parent9ddf9a6ef6f6419ced8379a803e5cccb4aab449f
Merge "Revert "Add a test exercising ptrace watchpoint functionality"" into nyc-dev am: cd0a8fa09d
am: 9ddf9a6ef6  -s ours

* commit '9ddf9a6ef6f6419ced8379a803e5cccb4aab449f':
  Revert "Add a test exercising ptrace watchpoint functionality"

Change-Id: I6adf7758ebad8ee56030a37b20d59df0cd5505d1