OSDN Git Service

Merge "New non-priv prebuilt" into nyc-dev
authorTodd Kennedy <toddke@google.com>
Mon, 6 Jun 2016 16:42:30 +0000 (16:42 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 6 Jun 2016 16:42:32 +0000 (16:42 +0000)

Trivial merge