OSDN Git Service

am 735e9734: am 46b3c730: Merge "Fix crash on Shamu since it\'s no longer camera...
authorSascha Haeberling <haeberling@google.com>
Mon, 25 Aug 2014 22:13:48 +0000 (22:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 25 Aug 2014 22:13:48 +0000 (22:13 +0000)
commit685803630e736272368bef027a5a7f925600217a
tree1a72f8cc74d2ffd1e085c6f277ea12c9a61ff09a
parentb7a31f57cd159744c6f7e00066201219f932536f
parent735e9734dc46ec69676b349c8665a322afc90c78
am 735e9734: am 46b3c730: Merge "Fix crash on Shamu since it\'s no longer camera 2 FULL." into ub-camera-glacier

* commit '735e9734dc46ec69676b349c8665a322afc90c78':
  Fix crash on Shamu since it's no longer camera 2 FULL.