OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12cfa36 8ce2d13)
am 8ce2d138: (-s ours) am 37ba3571: am df36ec57: am 0e6efbcc: Merge "NPE fix when...
authorztenghui <ztenghui@google.com>
Wed, 30 Apr 2014 18:14:50 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:50 +0000 (18:14 +0000)
* commit '8ce2d1388a37d9bd5e3fa05f563598a1481c290b':


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