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

* commit '2075de92c6b75ffcf7b57cb25947d08daf57772a':
  NullPointerException on activity in onDismiss


Trivial merge