OSDN Git Service

(root) / android-x86 / packages-apps-Contacts.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa03c45 1064eac)
am 1064eac6: am 60d19a75: show events in the UI
authorFred Quintana <fredq@google.com>
Thu, 1 Oct 2009 20:48:22 +0000 (13:48 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Oct 2009 20:48:22 +0000 (13:48 -0700)
Merge commit '1064eac6ef95f588fa5d5459f4fea5f1ef5ad93b'

* commit '1064eac6ef95f588fa5d5459f4fea5f1ef5ad93b':
  show events in the UI

1  2 
res/values/strings.xml patch | diff1 | diff2 | blob | history

diff --cc res/values/strings.xml
Simple merge
packages/apps/Contacts
About OSDN
Find Software
Develop Software
Help