OSDN Git Service

Merge "Fix build." into mnc-dev
authorDianne Hackborn <hackbod@google.com>
Fri, 31 Jul 2015 18:19:11 +0000 (18:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 31 Jul 2015 18:19:11 +0000 (18:19 +0000)

Trivial merge