OSDN Git Service
(root)
/
android-x86
/
packages-apps-Camera2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
876dc96
14461c5
)
am 14461c5d: am 766566ac: (-s ours) Reconcile with jb-mr0-release - do not merge
author
The Android Open Source Project
<initial-contribution@android.com>
Fri, 21 Sep 2012 16:11:43 +0000
(09:11 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 21 Sep 2012 16:11:43 +0000
(09:11 -0700)
* commit '
14461c5dcfbd1a4bd9d0853dcc0a627aba3eb6f2
':
Do not accept fling gesture after we changed from/to filmstrip mode.
Trivial merge