OSDN Git Service

resolved conflicts for merge of ff899495 to ub-camera-glacier
authorSascha Haeberling <haeberling@google.com>
Mon, 7 Jul 2014 18:34:19 +0000 (11:34 -0700)
committerSascha Haeberling <haeberling@google.com>
Mon, 7 Jul 2014 18:34:19 +0000 (11:34 -0700)
commitc78ffd7011c9841697a75bdc48c7011e806afaee
tree24c883ab99f492cb2a2995eadd2bbb706945efbe
parent336e533e6f41239bef2b236beabaae93e11301af
parentff8994953ada97684f7c894151754d8631b719fa
resolved conflicts for merge of ff899495 to ub-camera-glacier

Change-Id: Iffdde32e6f2b70d6a2fc560c6347a159678a7c60
src/com/android/camera/settings/CameraSettingsActivity.java