tree de847d042b4786575ea225c15c65fccd26d4f529
parent 37f1a8b4fb36cf07bba7e23106e2f808eee2772a
parent aea9fa1fe55c0b9af0bee85c811b1dff87c45fb6
author saurav subedi <subedi@google.com> 1536280327 -0700
committer android-build-merger <android-build-merger@google.com> 1536280327 -0700

Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev am: 6cc6a0c703  -s ours" into pie-cts-dev am: 601d7ae0d7  -s ours am: 8d9fecee8b
am: aea9fa1fe5  -s ours

Change-Id: Id3f80213c0a2617a416142a83ba86c0d49f72f2f