OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6097562 01c11f6)
am 01c11f67: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 29 Nov 2012 23:44:33 +0000 (15:44 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Nov 2012 23:44:33 +0000 (15:44 -0800)
* commit '01c11f67fd31d693f00c9c5a961ca251699d233b':


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