OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3005561 b263fd9)
am b263fd97: am 3253b263: Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Nov 2012 15:31:13 +0000 (07:31 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Nov 2012 15:31:13 +0000 (07:31 -0800)
* commit 'b263fd97087ef7aba761397246124e4fcf3a4f2f':


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