tree 9602c27df473b3f10c36ca76ad461916bb6ed58b
parent 8782a12005e90bbd49be579fb8ede3a42a007380
parent ccf7b2aac600b6069f03f7f420872b64cc5e6726
author Deepanshu Gupta <deepanshu@google.com> 1405719928 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405719928 +0000

am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

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