OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c6faf8 486ac23)
am 486ac238: am 5636617c: Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Nov 2012 14:27:05 +0000 (06:27 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Nov 2012 14:27:05 +0000 (06:27 -0800)
* commit '486ac23882dcca5998a8914f3f80e2597537ffd9':


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