tree 3b250bd32a24a12064a92a95be0327c3d4ff1f1a
parent bc6c2016e16c735721fdeacc1241bac8fa0be4b8
parent facf321e0577993f6482f5d949e21f4cec143e71
author Android Merger <noreply-android-build-merger@google.com> 1536269504 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1536269504 +0000

Merge "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"