OSDN Git Service
(root)
/
android-x86
/
packages-apps-Camera2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c0fe8ca
91469c4
)
am 91469c4a: am 2f001066: Merge "Put conversion from string to size into SettingsMana...
author
Sascha Haeberling
<haeberling@google.com>
Wed, 30 Jul 2014 01:26:22 +0000
(
01:26
+0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 30 Jul 2014 01:26:22 +0000
(
01:26
+0000)
* commit '
91469c4add9ed9b71172787208c96d3ddeedd857
':
Put conversion from string to size into SettingsManager.
Trivial merge