OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7055778 057eb40)
am 057eb404: (-s ours) am a5176670: am 033a54ec: am c33fc8de: (-s ours) am 48349ea9...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 4 Sep 2014 17:46:19 +0000 (17:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Sep 2014 17:46:19 +0000 (17:46 +0000)
* commit '057eb404363184b75ab0e5d3768a22126703f750':
  Resolve color xml attributes properly. [DO NOT MERGE]


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help