am 368be866: Merge "Add tests back to master mustpass"
authorPyry Haulos <phaulos@google.com>
Wed, 16 Sep 2015 21:01:37 +0000 (21:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Sep 2015 21:01:37 +0000 (21:01 +0000)
* commit '368be866c4c635a240737b8f3a550d4e80848778':
  Add tests back to master mustpass


Trivial merge