OSDN Git Service

Merge "Fix master build"
authorColin Cross <ccross@android.com>
Thu, 21 Jul 2016 04:47:57 +0000 (04:47 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 21 Jul 2016 04:47:58 +0000 (04:47 +0000)

Trivial merge