OSDN Git Service

am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 4 Sep 2014 05:56:35 +0000 (05:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Sep 2014 05:56:35 +0000 (05:56 +0000)
commit06a31255133bcc21ed2f1d821b5e120fefddc117
tree8233b79ef0a18576041801bc14dd8d4bcd4e5dc2
parent80b901611008824ff897f5434a840680b1ae40d5
parent3f1cc48ad1f87e8ea35d2d706eafb707743cc662
am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev

* commit '3f1cc48ad1f87e8ea35d2d706eafb707743cc662':
  Resolve color xml attributes properly. [DO NOT MERGE]