tree 1a9781e6733cb553a1b2c56305b794ee23f8cc02
parent 22921895d12ad7977c05365806934e3a74586cc7
parent 6c4ab88491e972111a59e3cbc93a70d1b55b1ab8
author Sarmad Hashmi <mhashmi@google.com> 1473887891 +0000
committer android-build-merger <android-build-merger@google.com> 1473887891 +0000

[DO NOT MERGE] Fix block/unblock crash in call log history tab. am: 90221588e1 am: 90c6a2c115
am: 6c4ab88491  -s ours

Change-Id: Ib32b5d24aa0805d080b5a078a6d591d20c4951c9