tree d74d0d6a10c61b2fe0daf1175fb89c16667bb21d
parent a27c913593b4a342daf8cf9695df35c27ad76a55
parent 8ce5cb4f1afba51d3566a5955dd97881c4ac8cfc
author Android Merger <noreply-android-build-merger@google.com> 1535412107 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1535412107 +0000

Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for section 5.2/5.3" into oreo-cts-dev am: acc9a3ed37  -s ours" into oreo-mr1-cts-dev