tree 2377566efdf5d60f9b39d7615f2f40a4718fc55c
parent 7dfaab2f7257c864a1611e527eded5d115ed4928
parent df415e40ada43799eebc7784bdeb1f71754cf85e
author zachh <zachh@google.com> 1516762576 +0000
committer android-build-merger <android-build-merger@google.com> 1516762576 +0000

Merge "Don't garbage collect voicemails in AnnotatedCallLog." am: af52cd8e29
am: df415e40ad

Change-Id: I5d6c1c97001f04e558b99dca3a23e11ab2758e29