tree 6d8c6d901ddd5b451895577c0c255de5e50690ed
parent 83478acb87e57769a478e96ce72f1201f7222e86
parent e25dbaa619bab4291e1013582a0b59e7b82d4db8
author Christine Franks <christyfranks@google.com> 1494966875 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494966881 +0000

Merge "Fix broken retaildemo tests" into oc-dev