tree 2dccc348a3c902d3b8f03aeb2e9b5b607b37f6db
parent 27d8d4ea190ba0a7281073713cf7c8966486dcc3
parent 69b668c251f22da03515daf99b38d9a8e604ad8c
author Elliott Hughes <enh@google.com> 1442012731 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442012731 +0000

am 69b668c2: am 0401a3bf: Merge "add gtest to darwin and windows whitelist for adb_test"

* commit '69b668c251f22da03515daf99b38d9a8e604ad8c':
  add gtest to darwin and windows whitelist for adb_test