Merge "Fix negative test incorrectly testing levels instead of layers am: a9301cb50f...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 21 Apr 2016 23:56:17 +0000 (23:56 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 21 Apr 2016 23:56:17 +0000 (23:56 +0000)

Trivial merge