am 41145fa6: am 8acab642: am b0f812a1: (-s ours) am dafc0617: Remove negative tests...
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 21:00:05 +0000 (21:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 21:00:05 +0000 (21:00 +0000)
* commit '41145fa69a0168ef4d8956e1f978c06b572aaa6b':


Trivial merge