Merge "Allow more alternative forms of scalar reflect function" into nyc-dev
authorMika Isojarvi <misojarvi@google.com>
Fri, 25 Mar 2016 18:23:17 +0000 (18:23 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 25 Mar 2016 18:23:17 +0000 (18:23 +0000)

Trivial merge