tree b250ca3d3f0ae42c5d9140615691788510fe2773
parent 02fd5a430be5b3ab005f9a1b0d0518df55c4f66e
parent 98bc4a6a790abda53b621fac2354af6f324ee930
author Nancy Chen <nancychen@google.com> 1415830418 +0000
committer android-build-merger <android-build-merger@google.com> 1415830418 +0000

Merge "Get info from SubInfoRecord for color and icon." into lmp-mr1-dev
automerge: 98bc4a6

* commit '98bc4a6a790abda53b621fac2354af6f324ee930':
  Get info from SubInfoRecord for color and icon.