OSDN Git Service

am 32c2b20c: (-s ours) am 583b6898: am fe48ca3e: am 4ff3c7f0: (-s ours) am 08840806...
authorDeepanshu Gupta <deepanshu@google.com>
Mon, 21 Jul 2014 18:23:25 +0000 (18:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 Jul 2014 18:23:25 +0000 (18:23 +0000)
* commit '32c2b20cb78258b995cecf8cbb5e38fe44895944':
  Fix style resolution for styles with '.' [DO NOT MERGE]


Trivial merge