tree 6619e422956da1a444c119ff1d3b9ee686f9db9b
parent 41052ebd934645530fe3a153285bd03d27570a6c
parent d5ae80ee9ebdfe2fe732ae0e2dad0b4ec16e9758
author Wenyi Wang <wenyiw@google.com> 1482273771 +0000
committer android-build-merger <android-build-merger@google.com> 1482273771 +0000

DO NOT MERGE Guard against SecurityException in QuickContact
am: d5ae80ee9e  -s ours

Change-Id: Id4ee6b70e79013db5fa49fbe0a8da2cbd0a65d77