tree 48c36ec127c7abde03cb6851fe96847db29f281b
parent 6a0c808487392f6cd8d62ad4abb51c0f077ace0f
parent 10d620ff2c4770e926b693e833105e8dbbd5fa86
author Deepanshu Gupta <deepanshu@google.com> 1425325483 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425325483 +0000

am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev

* commit '10d620ff2c4770e926b693e833105e8dbbd5fa86':
  Better error msg for StateList/Hexadecimal Color.