OSDN Git Service

am baae9e84: am 8bbb5122: Merge "add null check to updateCameraParametersPreferences...
authorSpike Sprague <spikuru@google.com>
Fri, 19 Sep 2014 19:32:08 +0000 (19:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Sep 2014 19:32:08 +0000 (19:32 +0000)
* commit 'baae9e8478990258edc7e6d014a68e0796859de9':
  add null check to updateCameraParametersPreferences to apease the monkey


Trivial merge