tree 872814fc777ed0d933ae465082a89ddb9245a51a
parent b15e56877de1d8c0ec9fbb44671227a6ef4fddb4
parent 12ab630c94d07994d7e4376ab835e2fe3c558547
author Ihab Awad <ihab@google.com> 1414684694 +0000
committer android-build-merger <android-build-merger@google.com> 1414684694 +0000

Merge "PhoneAccounts include literal icon bitmap (4/4)" into lmp-mr1-dev
automerge: 12ab630

* commit '12ab630c94d07994d7e4376ab835e2fe3c558547':
  PhoneAccounts include literal icon bitmap (4/4)