OSDN Git Service

(root) / android-x86 / packages-apps-Calendar.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 37edf5f 02e1813)
am 02e18131: (-s ours) do not merge: cherrypicked 53f5bc273b81a3761242d3356ed8490b5e6...
authorFred Quintana <fredq@google.com>
Mon, 17 Aug 2009 00:20:23 +0000 (17:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Aug 2009 00:20:23 +0000 (17:20 -0700)
Merge commit '02e18131c683de10a4bc3bec5b5f2e82e9de56dc'

* commit '02e18131c683de10a4bc3bec5b5f2e82e9de56dc':
  do not merge: cherrypicked 53f5bc273b81a3761242d3356ed8490b5e6797f2 and 6a0f4ad567c09827185e64109ef84275332e8d56 from master branch


Trivial merge
packages/apps/Calendar
About OSDN
Find Software
Develop Software
Help