am 8acab642: am b0f812a1: (-s ours) am dafc0617: Remove negative tests for sliced...
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 14:46:53 +0000 (14:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:46:53 +0000 (14:46 +0000)
* commit '8acab642a75ee8e511c429573b485d629b3b58ed':


Trivial merge