Merge "NullPointerException on activity in onDismiss" am: 2075de92c6
Jeff Sharkey [Tue, 5 Jan 2016 16:17:09 +0000 (16:17 +0000)]
am: 27cb48d40e

* commit '27cb48d40e85d207b66a34cd0ae85edcfeeebaf9':
  NullPointerException on activity in onDismiss


Trivial merge