OSDN Git Service
(root)
/
android-x86
/
packages-apps-Gallery2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3a106dc
c0715fd
)
resolved conflicts for merge of c0715fd5 to master
author
Jeff Sharkey
<jsharkey@android.com>
Thu, 1 Dec 2011 19:48:20 +0000
(11:48 -0800)
committer
Jeff Sharkey
<jsharkey@android.com>
Thu, 1 Dec 2011 19:50:15 +0000
(11:50 -0800)
Change-Id: Iab2221b984c2b86d0b220466f58368fbf1af5e20
Trivial merge