tree 4e0a965be07821658a11c34aecc0dbc147e589a2
parent 850ae315b8797844c12920e90a533a780d7a5df5
parent c281ad0188b653544dbaae07becb663671d64786
author Marcus Hagerott <mhagerott@google.com> 1481654037 +0000
committer android-build-merger <android-build-merger@google.com> 1481654037 +0000

Merge changes I64bf55bb,I91e80704 into ub-contactsdialer-h-dev
am: c281ad0188

Change-Id: I6d1238a1f5b9e700632ea44279de29ccd96c93e6