OSDN Git Service

Merge "Fix broken retaildemo tests" into oc-dev
authorChristine Franks <christyfranks@google.com>
Tue, 16 May 2017 20:34:35 +0000 (20:34 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 16 May 2017 20:34:41 +0000 (20:34 +0000)

Trivial merge