diff options
| author | Adrian Roos <roosa@google.com> | 2014-06-11 13:10:43 +0200 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2014-06-11 13:10:43 +0200 |
| commit | cabd8647ac9a10465627818ebdef409b7ddd3583 (patch) | |
| tree | 145703a8019bbc34164fd452d940014afa8ca6c1 /AndroidManifest.xml | |
| parent | 9e17b4165418dec3b4872ed43a8844c950beedec (diff) | |
| parent | 469e9df00dab07ce3f810d3ffa9a3261f1b71b52 (diff) | |
resolved conflict for merge of 469e9df0 to master
Change-Id: Ic96a35172c113e8b25084de3c8cf5e44f931903b
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions