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)
commit05726805f28d9896ea31ba31b5d917aae06c98e4
tree6ccd87eca38a8d81e67c680461658de9a4bb6836
parentc5e34c971db85f43923577e93daeed5b846d5359
parent61658d7577630686ffc689ed6cab2e404398b8ef
Merge "Revert "Add a test exercising ptrace watchpoint functionality"" into nyc-dev am: cd0a8fa09d  -s ours
am: 61658d7577

* commit '61658d7577630686ffc689ed6cab2e404398b8ef':
  Revert "Add a test exercising ptrace watchpoint functionality"

Change-Id: Ifc61d7aefe1c923d1ce015fcb0499fa98a4b2aaf