commit | b48816c5873260c78e90f245f8cf31a992a1744f | [log] [tgz] |
---|---|---|
author | Christine Franks <christyfranks@google.com> | Tue May 16 20:56:06 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue May 16 20:56:06 2017 +0000 |
tree | 21bb9feee3086daac12bcfda4cb22f141670478c | |
parent | a9b1ea8e90ebef21c1d5067f5f53edcef21ff1da [diff] | |
parent | 95e1ef694c31f343da8b386d7f3c998623012ef8 [diff] |
Merge "Fix broken retaildemo tests" into oc-dev am: cda99f106b am: 95e1ef694c Change-Id: I65bf196ea9add33b4b12b93427501eead636bdc4