OSDN Git Service

Merge "Fix build"
authorAlan Viverette <alanv@google.com>
Mon, 23 Mar 2015 23:03:07 +0000 (23:03 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 23 Mar 2015 23:03:09 +0000 (23:03 +0000)

Trivial merge