OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: efd2968 4c312f2)
am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolu...
authorDeepanshu Gupta <deepanshu@google.com>
Fri, 18 Jul 2014 21:57:44 +0000 (21:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Jul 2014 21:57:44 +0000 (21:57 +0000)
* commit '4c312f20cafc3160e04224f18cacd8d35a7f9e3c':
  Fix style resolution for styles with '.' [DO NOT MERGE]


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