tree f638e2bb06fb8221c3fe4d18d87aff6440a1e23c
parent 4d6a097bdd42e9a0dea62d8ca6c909a927c117f6
parent 15e40bea2475529d3c1d77446b46849f384e793b
author Nancy Chen <nancychen@google.com> 1414704432 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1414704432 +0000

Merge "Temporarily use hardcoded values for sim color display." into lmp-mr1-dev