am c3bc8b7b: am 1bfbf19b: Merge "Fix night/notnight resource folder handling." into gingerbread

Merge commit 'c3bc8b7b08611c8d86919f4695430990bc6b475d'

* commit 'c3bc8b7b08611c8d86919f4695430990bc6b475d':
  Fix night/notnight resource folder handling.