Merge "Fix negative test incorrectly testing levels instead of layers am: a9301cb50f...
authorMika Isojärvi <misojarvi@google.com>
Thu, 21 Apr 2016 23:58:29 +0000 (23:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Apr 2016 23:58:29 +0000 (23:58 +0000)
am: f5c384ff9e

* commit 'f5c384ff9e96dcb67442726a7e7c74408bceb7dd':

Change-Id: I733c745c09801ecc111e8833678162b2b5413386


Trivial merge