tree f5bbbf12ec47d9710c0725f342d072136d38789e
parent e87c52bcb10cf2698d4f34dc9e849e95cfb16e73
parent 9cda553dc64b3186e72784248e6167422cb66dd4
author Android Merger <noreply-android-build-merger@google.com> 1515611720 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1515611720 +0000

Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev

* changes:
  Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev am: 3bfff62174
  DO NOT MERGE Add CTS test for URI fix. am: 5470431480  -s ours am: 3daf33c78e  -s ours