tree b6588fe2020dfc0b6a91c55103f52d0377b3da41
parent afdcf2a494e27a4423df1c24ef4533e1d924ee44
parent 48a41fccf263d39385408603e7759952e2e3484f
author Malcolm Chen <refuhoo@google.com> 1498526281 +0000
committer android-build-merger <android-build-merger@google.com> 1498526281 +0000

Add null check of getActivity() in initializeSubscriptions. am: b1eeb07ce5
am: 48a41fccf2  -s ours

Change-Id: Icc315f66df0b9fa65c9e151fd32689a45d4ec296