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:19:18 +0000 (17:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 May 2016 17:19:18 +0000 (17:19 +0000)
commit61658d7577630686ffc689ed6cab2e404398b8ef
tree6ccd87eca38a8d81e67c680461658de9a4bb6836
parent54e38cbdb362a71eee79f08da9cc06602e66a9b3
parentcd0a8fa09d284b49adbb2345821ce481fe369972
Merge "Revert "Add a test exercising ptrace watchpoint functionality"" into nyc-dev
am: cd0a8fa09d  -s ours

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

Change-Id: I3fc5badf12c0c5df4fedd0fb420466ccbf6323fa