OSDN Git Service

Merge "Merge "Fix broken test" into oc-mr1-dev am: d8e7cb4b47" into oc-mr1-dev-plus...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 15 Aug 2017 22:26:54 +0000 (22:26 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 15 Aug 2017 22:26:54 +0000 (22:26 +0000)

Trivial merge