OSDN Git Service

am 338e32ba: (-s ours) am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 4 Sep 2014 17:14:49 +0000 (17:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Sep 2014 17:14:49 +0000 (17:14 +0000)
commitf4ba8731441035d8f3bc4dc622e2eca6eeb47a3d
tree85480a6878ff45ef27df5c3611f5d50af6a68dcd
parent296b120c3053db8b92fb84cb7f433da7f4e99a25
parent338e32ba521df8cbd295e69d8f20626452baa4a5
am 338e32ba: (-s ours) am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '338e32ba521df8cbd295e69d8f20626452baa4a5':
  Resolve color xml attributes properly. [DO NOT MERGE]