diff options
| author | Andrew Lee <anwlee@google.com> | 2014-05-09 18:07:20 -0700 |
|---|---|---|
| committer | Andrew Lee <anwlee@google.com> | 2014-05-09 18:07:20 -0700 |
| commit | c8caa6b8ca6fbfe58f5f61160f7b08b1f00be025 (patch) | |
| tree | de89b5fcc2950ca9fad2fbc19dcdcb84f25ab4ac /InCallUI/res/values-in/strings.xml | |
| parent | 6cfe4b88f21142eb6145368e5f51a25904262b3b (diff) | |
| parent | bc36839e4178147bfb9dba29955cb26d57bdf0fa (diff) | |
resolved conflicts for merge of 41ffd656 to master-nova
Change-Id: Ie8f34527c54b99e4e6530ff9ccf2bfb24f222487
Diffstat (limited to 'InCallUI/res/values-in/strings.xml')
0 files changed, 0 insertions, 0 deletions