OSDN Git Service

Merge "Fix build" into nyc-dev
authorJulia Reynolds <juliacr@google.com>
Thu, 17 Mar 2016 18:07:48 +0000 (18:07 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 Mar 2016 18:07:48 +0000 (18:07 +0000)
commit7c802419fd99445442cb7499757dbcadda18fee0
tree9d39864f3bab913e116a33014f0d7db0c3a4914c
parentbef02df556fd4ea09c416025b67e6769b25a6c4a
parent40a82187c5c4f2e2467c7984c108367ad9db3a37
Merge "Fix build" into nyc-dev