tree 5d151fc3af2b95e4c65ccfd2323be5bdb1c16376
parent 25584147427cb1cbc12352d83b1183c07b60ae2c
parent fc7662f73d7a9576cd881f16551f94dd2fcad8ab
author Nicolas Geoffray <ngeoffray@google.com> 1462952614 +0000
committer android-build-merger <android-build-merger@google.com> 1462952614 +0000

Merge "Revert "Blacklist test.""
am: fc7662f73d

* commit 'fc7662f73d7a9576cd881f16551f94dd2fcad8ab':
  Revert "Blacklist test."

Change-Id: I9ee9f68298102cd21617a759c871a55e1073c723