OSDN Git Service

Merge "DO NOT MERGE ANYWHERE: Fix build" into oc-wear-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Mon, 17 Jul 2017 22:23:57 +0000 (22:23 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 17 Jul 2017 22:23:57 +0000 (22:23 +0000)

Trivial merge