OSDN Git Service

am a4d97866: am 2d70a5a9: am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506a...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 4 Sep 2014 06:26:25 +0000 (06:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Sep 2014 06:26:25 +0000 (06:26 +0000)
commit7f26655a5bcaa8a6273ed603a465090d0e434d07
tree8a43478a358ad339f049a1a1a217b9ffcd0a482f
parent84268142a64d463453556588bd4f7092af31fae9
parenta4d978668219572b71538dc98dab461fe99dfcc3
am a4d97866: 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 'a4d978668219572b71538dc98dab461fe99dfcc3':
  Resolve color xml attributes properly. [DO NOT MERGE]