am 1bd6e4d3: am 29aa966c: am 5ec57688: Merge "Reorder user icon colors so that the first default is teal" into lmp-dev
am 1bd6e4d3: am 29aa966c: am 5ec57688: Merge "Reorder user icon colors so that the first default is teal" into lmp-dev

* commit '1bd6e4d3e189b9a1ff1f403cb6b8447685e05840':
  Reorder user icon colors so that the first default is teal

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base