tree 9d049dd0e72c98613b22495957db4d41ffa410fd
parent 4f535d960a28c73364a5e38889f53333ecce6292
parent d6343236400959b2d4cb204d58f3536b054e7dea
author Julien Desprez <jdesprez@google.com> 1530208356 -0700
committer android-build-merger <android-build-merger@google.com> 1530208356 -0700

[automerger skipped] Merge "DO NOT MERGE Remove the placeholder test failure during preparation" into oreo-mr1-cts-dev
am: d634323640  -s ours

Change-Id: I8f900dcb8ae0cfbf1e69691ceab77106606e4d06