diff options
| author | Baligh Uddin <baligh@google.com> | 2014-09-26 09:25:59 -0700 |
|---|---|---|
| committer | Baligh Uddin <baligh@google.com> | 2014-09-26 09:25:59 -0700 |
| commit | df59d55631aaae0b290696cf7346b071053dc005 (patch) | |
| tree | 080ef4c7a6e6694716ba97e9569f3204925d3d8b /res/values-ja/strings.xml | |
| parent | 7a29738a3cf73e4f536c8e41857a6ebc6a3662cc (diff) | |
| download | Contacts-df59d55631aaae0b290696cf7346b071053dc005.tar.gz | |
Fix Build - remove merge conflict markers.
Change-Id: I8de2abce4b43d0c981216079d267e1f61c0f805b
Diffstat (limited to 'res/values-ja/strings.xml')
0 files changed, 0 insertions, 0 deletions