tree 5b3bdff0339b778cfbcf0459b93b976337e0129b
parent 1315a095bd38a9e6e6016275791bc3318997a5de
parent da965cea827b83702137d34bed5ff24a9afb91ea
author saurav subedi <subedi@google.com> 1533921431 -0700
committer android-build-merger <android-build-merger@google.com> 1533921431 -0700

[automerger skipped] Merge "DO NOT MERGE: CDD annotations for Section 3.9" into oreo-mr1-cts-dev
am: da965cea82  -s ours

Change-Id: I4fbe22083f9679a0f9a2c2971c20a6cc9bdb483c