diff options
| author | Evan Charlton <evanc@google.com> | 2014-05-13 16:42:42 -0700 |
|---|---|---|
| committer | Evan Charlton <evanc@google.com> | 2014-05-13 16:42:42 -0700 |
| commit | 9d180ef424cdefd81c2e854f75d453d4944312f2 (patch) | |
| tree | 967f2714b7c695a2c8690d8099672ae2c639bbb8 /AndroidManifest.xml | |
| parent | c836f76cd86d0e11410d9a5c2710a305847d6cd3 (diff) | |
| parent | 277ae05e6fe95c147de3dba4f50c34684f0766d8 (diff) | |
resolved conflicts for merge of 277ae05e to master
Change-Id: Ibaedc14b791fb28f45963fbcededc37840965627
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions