OSDN Git Service

am 9b907157: (-s ours) am d2966fce: am 2e11bba3: am 0804e0ad: (-s ours) am a9e488a6...
authorDeepanshu Gupta <deepanshu@google.com>
Mon, 21 Jul 2014 18:23:16 +0000 (18:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Jul 2014 18:23:16 +0000 (18:23 +0000)
* commit '9b90715728ee06300c1a8729c553563388301734':
  Fix style resolution for styles with '.' [DO NOT MERGE]


Trivial merge