Merge "Gallery2: Fix use of uninitialized stack variables" into nyc-dev
am: fc0d616

* commit 'fc0d6167702c3d79124179e1e2d3bf70474c61a8':
  Gallery2: Fix use of uninitialized stack variables