tree d2987d801e34d38e544b41e4933fe8086d1329fe
parent 2b1db0743f7af28785b92e30436cce20143872be
parent 3e2d20636f9eaee1226074b99017d759c6f3b7a0
author Nicolas Geoffray <ngeoffray@google.com> 1450200983 +0000
committer android-build-merger <android-build-merger@google.com> 1450200983 +0000

Merge "Remove test given its flakiness."
am: 3e2d20636f

* commit '3e2d20636f9eaee1226074b99017d759c6f3b7a0':
  Remove test given its flakiness.