| commit | 9c59494602b858af7f8cbbb652437f9ed1b3fbfa | [log] [tgz] |
|---|---|---|
| author | Priyank Singh <priyanksingh@google.com> | Wed Feb 27 14:58:51 2019 -0800 |
| committer | David Nelloms <davidln@google.com> | Thu Mar 07 21:37:56 2019 +0000 |
| tree | 9a2afba792354fae2e88f36e6b4c414f8e4788cc | |
| parent | e971a21a8133496eff6804139691e5ccbc4c3176 [diff] |
ResolverActivity uses the content in this file to be the root element and <merge> cannot be used as the root element. Bug: 126268681 Test: Manual Change-Id: I7012ceea3b5355f8840ad792eef34de3aaa87ecd (cherry picked from commit 705a067efa2bcc2448033b46709986a975ff4859)