tree 560a4795e0029bd21f2a44b79c98ae48b54a28ac
parent da66c450855085a10ed8766d28e8159a56c73051
parent 9db88aa1936e2bb2176edeb3538fd2700fa73cce
author Boris Zanin <boris.zanin@mobica.com> 1567026700 -0700
committer android-build-merger <android-build-merger@google.com> 1567026700 -0700

[automerger skipped] [RESTRICT AUTOMERGE] Remove conformance version test from Android am: fad17eec2d -s ours
am: 9db88aa193 -s ours
am skip reason: subject contains skip directive

Change-Id: I24e7a955a0a5701c49ce82c78b8f1a147838988f