diff options
author | Danny Baumann <dannybaumann@web.de> | 2015-03-25 12:47:27 +0100 |
---|---|---|
committer | Danny Baumann <dannybaumann@web.de> | 2015-03-25 12:49:26 +0100 |
commit | 49b9b24a35b2f0b53b6fbd84c5fc54de6151fd8c (patch) | |
tree | 352d55a4cb27816a6f74c6c0d4db369cd437995e /res/color | |
parent | c569a957df64f0432a7d5e8fd5f60ac19e34542a (diff) | |
download | android_packages_apps_Dialer-staging/cm-12.1-test.tar.gz android_packages_apps_Dialer-staging/cm-12.1-test.tar.bz2 android_packages_apps_Dialer-staging/cm-12.1-test.zip |
Fix merge relicts.staging/cm-12.1-test
Change-Id: I5a352640ba5704acd69382e53a15626cfd214487
Diffstat (limited to 'res/color')
0 files changed, 0 insertions, 0 deletions