OSDN Git Service

am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolu...
authorDeepanshu Gupta <deepanshu@google.com>
Fri, 18 Jul 2014 21:49:11 +0000 (21:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Jul 2014 21:49:11 +0000 (21:49 +0000)
* commit '610341b3eb99ef2f070c96d60ca30c28283f1dea':
  Fix style resolution for styles with '.' [DO NOT MERGE]


Trivial merge