Merge "Touch process watchdog in built-in precision tests" into marshmallow-cts-dev
authorDaniel Xie <dxie@google.com>
Tue, 23 Feb 2016 22:21:55 +0000 (22:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Feb 2016 22:21:55 +0000 (22:21 +0000)
commit88cd3abfe7db05a823a1fe6a427fc566656eb049
tree4d30c3556882a6fb76aa14897121a0eba87dea4a
parent5f20d03e3842cdca757e56436c6769aaf77706ea
parent9f0c301083f5aa5abbbf907dee102da607780069
Merge "Touch process watchdog in built-in precision tests" into marshmallow-cts-dev
am: 9f0c301083

* commit '9f0c301083f5aa5abbbf907dee102da607780069':
  Touch process watchdog in built-in precision tests