OSDN Git Service

am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours...
authorDeepanshu Gupta <deepanshu@google.com>
Fri, 18 Jul 2014 22:07:31 +0000 (22:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Jul 2014 22:07:31 +0000 (22:07 +0000)
commit3f51ab0d81b3f24a0246f3bfe28ea5b364b48210
treec432967584d08d3c09ec0427f572f92a38fb8672
parentc35afdfd4c40e55e235791341c515bd012d77146
parent3c92b93226195523ff857763901a33847165ee9e
am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

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