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)
commite03a2901052782f6bab78a488cad29421aa21118
treef036f3e5568be3fa18998c40c08a47161b8f5785
parent6cbda79410b0609d212cd8d3d2838dad9b18dfbc
parent368be866c4c635a240737b8f3a550d4e80848778
am 368be866: Merge "Add tests back to master mustpass"

* commit '368be866c4c635a240737b8f3a550d4e80848778':
  Add tests back to master mustpass