Merge "Query profile mask to correct variable in context test" into nyc-dev
authorMika Isojärvi <misojarvi@google.com>
Thu, 10 Mar 2016 23:37:47 +0000 (23:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 10 Mar 2016 23:37:47 +0000 (23:37 +0000)
am: 88c70c5b7d

* commit '88c70c5b7d54cac9a19651cf72b2625d1df438af':
  Query profile mask to correct variable in context test


Trivial merge