diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2010-12-07 11:12:56 -0800 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2010-12-07 11:12:56 -0800 |
commit | d73aa540c36fd62108ca022d34c441d0dfd492de (patch) | |
tree | 0ed2fa0df0a947df6c861a55b5ccd83ef7b37c1a /res/drawable-mdpi/ic_btn_round_minus.png | |
parent | 9d71d5984211d2d5a5defcd7f034b4c813d185c2 (diff) | |
parent | e12c383fc76887e3cb8bbf983e10ae92c1e46929 (diff) | |
download | android_packages_apps_Calendar-d73aa540c36fd62108ca022d34c441d0dfd492de.tar.gz android_packages_apps_Calendar-d73aa540c36fd62108ca022d34c441d0dfd492de.tar.bz2 android_packages_apps_Calendar-d73aa540c36fd62108ca022d34c441d0dfd492de.zip |
resolved conflicts for merge of e12c383f to stage-korg-master
Change-Id: I0829a16cc64b0256f6b8e07f3e4ff8f3173369ed
Diffstat (limited to 'res/drawable-mdpi/ic_btn_round_minus.png')
0 files changed, 0 insertions, 0 deletions