Merge "Touch process watchdog in built-in precision tests" into marshmallow-cts-dev...
authorDaniel Xie <dxie@google.com>
Tue, 23 Feb 2016 23:02:44 +0000 (23:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Feb 2016 23:02:44 +0000 (23:02 +0000)
commit987122e4ef7ad5455f8b4b02c06fbdb48f197578
tree5148bc5ab8e313cd67f210fc882b3bc8bbc6dbd2
parent54d6fb0b9cc1e30a088ccf1fc85d31105a7d5dbe
parent88cd3abfe7db05a823a1fe6a427fc566656eb049
Merge "Touch process watchdog in built-in precision tests" into marshmallow-cts-dev am: 9f0c301083
am: 88cd3abfe7

* commit '88cd3abfe7db05a823a1fe6a427fc566656eb049':
  Touch process watchdog in built-in precision tests
modules/glshared/glsBuiltinPrecisionTests.cpp