commit | baee53bc6483d6a8d80c7ffab4ab5682560df036 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@google.com> | Thu Oct 11 22:59:10 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 11 22:59:10 2018 -0700 |
tree | 54591b1374ed716d8d323fba7811dabdf55ced6c | |
parent | 335b6c8624d75e924ecdf3405155642f45d7ea49 [diff] | |
parent | a305fbf85ec2c66942777034296378fcf06f0c83 [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am: ab80221a8c am: 893598cd4b am: 7656e1177f -s ours am: 58d1ac473e am: a305fbf85e -s ours Change-Id: Iaa330703a4dd63653210f9c64898d67c78aa2760