tree c28e5101978a5331a98d85a47ab1f8520bd4530d
parent 02b872bee14804e3f0e650986ce0f2c2914adbf4
parent ac0f9ffda2a7e48d2d641654dafd11b8da39830a
author Jeff Sharkey <jsharkey@android.com> 1395079033 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395079033 +0000

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

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