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)
am: cd0a8fa09d  -s ours

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

Change-Id: I3fc5badf12c0c5df4fedd0fb420466ccbf6323fa


Trivial merge