OSDN Git Service

am 3110a91c: am 028374b4: am 7a133b82: am baae9e84: am 8bbb5122: Merge "add null...
authorSpike Sprague <spikuru@google.com>
Fri, 19 Sep 2014 20:18:48 +0000 (20:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Sep 2014 20:18:48 +0000 (20:18 +0000)
commit0dc452ffc78e9eb007763986be16165f89870b5d
treecfef7eb37e9bf62ac011f04e1e58fb0bb5f9e34b
parent0ddc84ded0bb0ee8f73cfff5429d1627b887584b
parent3110a91c041e36a34d52df3d364b450539840704
am 3110a91c: am 028374b4: am 7a133b82: am baae9e84: am 8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier

* commit '3110a91c041e36a34d52df3d364b450539840704':
  add null check to updateCameraParametersPreferences to apease the monkey