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

Merge commit '1bfbf19bd93567d75d1f62c0ee3a81dddc7cc895' into gingerbread-plus-aosp

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