tree 7eb866b1e852f1a8312854b062e394fb624e0135
parent 70170261cbd966501a673ba5548dcab823037cfb
parent e323ff0653b07bca0c665be8f3fc5415e27bd2c7
author Ihab Awad <ihab@google.com> 1415760509 +0000
committer android-build-merger <android-build-merger@google.com> 1415760509 +0000

am cf9248cb: am 9114a845: Merge "Update PhoneAccount icon API (1/6)" into lmp-mr1-dev
automerge: e323ff0

* commit 'e323ff0653b07bca0c665be8f3fc5415e27bd2c7':
  Update PhoneAccount icon API (1/6)