tree 0a29010d5e85f6005cf899c0518d552e77ec9e37
parent 1d6dd378b2ea0fc8fcbbf73769cb9decce7e0789
parent c0066d32c084137dba8966cd855076ab99e4e3ab
author Gary Mai <garymai@google.com> 1479317890 +0000
committer android-build-merger <android-build-merger@google.com> 1479317890 +0000

Merge "Fix ExternalAccountTypeTests" into ub-contactsdialer-h-dev am: be7158495f
am: c0066d32c0

Change-Id: I07ea0eb240e49895f98f37b0892ab83a84d780d4