OSDN Git Service

Merge "Fix build." into mnc-dev
authorDianne Hackborn <hackbod@google.com>
Thu, 11 Jun 2015 21:32:22 +0000 (21:32 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 11 Jun 2015 21:32:24 +0000 (21:32 +0000)

Trivial merge