OSDN Git Service

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)
commit7f98066dd1a2a05d53ba39108dd4d44430e89c71
treec432967584d08d3c09ec0427f572f92a38fb8672
parentefd29681d8f8df6d23a1e7f307e9300bd8331a2f
parent4c312f20cafc3160e04224f18cacd8d35a7f9e3c
am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev

* commit '4c312f20cafc3160e04224f18cacd8d35a7f9e3c':
  Fix style resolution for styles with '.' [DO NOT MERGE]