tree ec53e44b4bc4d4d8145fed0b52d66cb880c3beeb
parent 45d96243c0a77477f6846e34d99a57d271b10a79
parent 6c24c56a113d88c0bb572f78c361c11ecee4843c
author Julien Desprez <jdesprez@google.com> 1550886041 -0800
committer android-build-merger <android-build-merger@google.com> 1550886041 -0800

[automerger skipped] Merge "RESTRICT AUTOMERGE: Move @Ignore from class level to method level" into pie-cts-dev
am: 6c24c56a11 -s ours
am skip reason: subject contains skip directive

Change-Id: I725c4ccfc176185dcebcc09ad384531bc0e479b1