tree 56e062c2d495a4fe682fcf74b65dcfee5fb54166
parent 07d453fa091ab407864d474f9bf2a5167686010a
parent 81449b2c4a63392bff22d77f331f4db52011884b
author Deepanshu Gupta <deepanshu@google.com> 1425325945 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425325945 +0000

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

* commit '81449b2c4a63392bff22d77f331f4db52011884b':
  Better error msg for StateList/Hexadecimal Color.