OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50ad9c7 c19b72f)
am c19b72f7: am 2f001066: Merge "Put conversion from string to size into SettingsMana...
authorSascha Haeberling <haeberling@google.com>
Fri, 15 May 2015 17:18:56 +0000 (17:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 May 2015 17:18:56 +0000 (17:18 +0000)
* commit 'c19b72f7435475c1ce50f31e6f069e45cdf026eb':


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