tree edf2a3f1b7e5ebfba03753c8571831ddbf5d58bc
parent 1ab5805e616bfacb5d101660e33ddaec26ead3f1
parent 45a66c09a96e76fe6b0ecec3390bf0cb88a9dfe1
author Brandon Maxwell <maxwelb@google.com> 1452729033 +0000
committer android-build-merger <android-build-merger@google.com> 1452729033 +0000

Merge "Changes needed to make Incoming calls work while fbe locked" into ub-contactsdialer-b-dev
am: 45a66c09a9

* commit '45a66c09a96e76fe6b0ecec3390bf0cb88a9dfe1':
  Changes needed to make Incoming calls work while fbe locked