diff options
author | linyuh <linyuh@google.com> | 2018-04-06 16:33:57 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-04-06 16:37:13 -0700 |
commit | cb39795cb8b91df33f304d8155f277f968036b5a (patch) | |
tree | d865e36350c513914c5b1eda80c71178f5602cbb /AndroidManifest.xml | |
parent | 57356b9960278cb033b47161d52bf0d367fa09e5 (diff) |
Resolve resource conflicts.
Bug: 77710848
Test: None
PiperOrigin-RevId: 191957734
Change-Id: I0b2674298722a405f4f2e970e877671cff37e60f
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions