OSDN Git Service

am 2d70a5a9: am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 4 Sep 2014 06:16:36 +0000 (06:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Sep 2014 06:16:36 +0000 (06:16 +0000)
commita4d978668219572b71538dc98dab461fe99dfcc3
tree0367d4be392d136501f8742162c5fcbeb0cae247
parentccd53eecb946ad8d08fb332f0159db4816e62604
parent2d70a5a9d1556f269b8ed79b1f6a896ce8241b51
am 2d70a5a9: am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev

* commit '2d70a5a9d1556f269b8ed79b1f6a896ce8241b51':
  Resolve color xml attributes properly. [DO NOT MERGE]