OSDN Git Service

am fa23013e: am 4a4683c7: (-s ours) am a92f199d: am 0ddd915f: am 509e5db1: Merge...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 4 Sep 2014 05:27:32 +0000 (05:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Sep 2014 05:27:32 +0000 (05:27 +0000)
commitba1d48dd247f46374a03e73a5b03f635b450ef8a
treef8f8265115ccc4bbb391ffafcc1b68bf3b6f7952
parentf92aa750b76583dac2cbb00b06771d979cd686d8
parentcd31f76067d2fa3a40365ead10794d66ee0ac0b6
am fa23013e: am 4a4683c7: (-s ours) am a92f199d: am 0ddd915f: am 509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev

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