OSDN Git Service

Merge "Fix build" into nyc-dev
authorAlan Viverette <alanv@google.com>
Tue, 23 Feb 2016 14:44:23 +0000 (14:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 23 Feb 2016 14:44:25 +0000 (14:44 +0000)

Trivial merge