diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-03 19:14:14 -0800 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-03 19:14:14 -0800 |
| commit | 7beb28b35da91ce5c5edae56eca36525532c60e2 (patch) | |
| tree | 941fdd78ed0524f440b5a7ece6aec8fed2f06836 /res/values-es-rXA | |
| parent | 72538b40adc59a8021749c830797d32ec7965460 (diff) | |
| parent | b29f26a146ae59a1d3cbc9a00eba6464db893c21 (diff) | |
| download | packages_apps_InCallUI-7beb28b35da91ce5c5edae56eca36525532c60e2.tar.gz packages_apps_InCallUI-7beb28b35da91ce5c5edae56eca36525532c60e2.tar.bz2 packages_apps_InCallUI-7beb28b35da91ce5c5edae56eca36525532c60e2.zip | |
Merge branch 'cm-11.0' into stable/cm-11.0
Conflicts:
res/values-fr/cm_strings.xml
res/values-nl/cm_strings.xml
Change-Id: I6313434f76233a9c5c37edbf665033656dd305e2
Diffstat (limited to 'res/values-es-rXA')
0 files changed, 0 insertions, 0 deletions