am da07fe64: am eeb36c5c: am d88d8174: Merge "Null pointer exception in FileRotator.java"

* commit 'da07fe64b09bbf75cf831067dfe678ed06950f8e':
  Null pointer exception in FileRotator.java