am 369443eb: am 2780be2d: (-s ours) am 8c92e5c1: Remove couple of cases due to HW...
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 14:46:38 +0000 (14:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:46:38 +0000 (14:46 +0000)
* commit '369443eb9e9a32316fdc35881ae22b99a95eefa7':


Trivial merge