OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bece15c fc207c7)
am fc207c7a: (-s ours) am 0b51d31c: am 2581af9b: Merge "add up button support for...
authorAlan Newberger <alann@google.com>
Wed, 30 Apr 2014 18:14:25 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:25 +0000 (18:14 +0000)
* commit 'fc207c7ae2becc4cd02a8a51088396205efa8743':


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