tree b27ccea8fec733d1a2cc1bba297d888cb343caa8
parent 36c21ca1365c0c3832742bc0cf75d3409723254b
parent 330dafba33f0d75929591095028779f068459431
author Sascha Haeberling <haeberling@google.com> 1381459163 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1381459163 +0000

Merge "Don't initialize photo module if it's paused." into gb-ub-photos-carlsbad