tree 59be354e010f9cf95aaa3d0cbbf9b1ff92fcacd6
parent d9aadde6047fed56a2dd2fe50ca5ba288a9e173a
parent 865adee70dd17a389c10cff9851757ccad1da868
author Android Merger <noreply-android-build-merger@google.com> 1515612383 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1515612383 +0000

Merge changes from topic "am-a8c42e83471740dd9885d0dcccdf8907" into oreo-cts-dev

* changes:
  Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev am: 293664a1fb
  DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours am: dfbb7a24e1  -s ours am: d9ac06f2c2  -s ours