Merge "Query profile mask to correct variable in context test" into nyc-dev
authorMika Isojarvi <misojarvi@google.com>
Thu, 10 Mar 2016 23:29:20 +0000 (23:29 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 10 Mar 2016 23:29:20 +0000 (23:29 +0000)

Trivial merge