OSDN Git Service

am 91469c4a: am 2f001066: Merge "Put conversion from string to size into SettingsMana...
authorSascha Haeberling <haeberling@google.com>
Wed, 30 Jul 2014 01:26:22 +0000 (01:26 +0000)
committerAndroid 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