tree b61ed3596d2ae21d261eb51671b1415335c0a2a9
parent d379ec190f7f33b92c7fe9f5931f7639dd340514
parent 20c23b511d61ef1d0000c0a94e0f63a8bfb8a7f0
author Paul Duffin <paulduffin@google.com> 1559845984 -0700
committer android-build-merger <android-build-merger@google.com> 1559845984 -0700

Merge "Convert copying of .txt files to .bp" am: 71fd29d891
am: 20c23b511d

Change-Id: Id49795d2fef415bbf264aa2690c05a5d64109c34