OSDN Git Service

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


Trivial merge