aadf040e8704d11a89f1b249446e4cedfaf998a6 - platform/cts

commit	aadf040e8704d11a89f1b249446e4cedfaf998a6	[log] [tgz]
author	Jeff Sharkey <jsharkey@google.com>	Fri Oct 12 04:31:16 2018 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Fri Oct 12 04:31:16 2018 +0000
tree	8ce80bbfda3f435a8ad4550e79a8e69da2295232
parent	9903acc127e0b569f46d1941be6b67b390e0af78 [diff]
parent	73e6b77e60c2daf7fa1512d592ce43d6a96e6040 [diff]

Merge changes from topic "am-f118bd02-223c-430c-b511-d73dcdeba196" into oc-dev

* changes:
  [automerger] Recover shady content:// paths. am: 3a22542c50 am: e3de2c53d5 am: f5da6fa32c am: 4b846eb619 am: 27b5fa9df6
  [automerger] Recover shady content:// paths. am: 3a22542c50 am: e3de2c53d5 am: f5da6fa32c am: 4b846eb619
  [automerger] Recover shady content:// paths. am: 3a22542c50 am: e3de2c53d5 am: f5da6fa32c
  [automerger] Recover shady content:// paths. am: 3a22542c50 am: e3de2c53d5
  [automerger] Recover shady content:// paths. am: 3a22542c50
  Recover shady content:// paths.

tree: 8ce80bbfda3f435a8ad4550e79a8e69da2295232