Merge "Add Visual Studio 2015 generator to build scripts"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 27 May 2016 18:28:44 +0000 (18:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 27 May 2016 18:28:44 +0000 (18:28 +0000)

Trivial merge