OSDN Git Service

Merge "Revert "Revert "Fix build.""" into mnc-dev
authorFilip Gruszczynski <gruszczy@google.com>
Mon, 1 Jun 2015 16:07:47 +0000 (16:07 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 1 Jun 2015 16:07:48 +0000 (16:07 +0000)

Trivial merge