tree eeea6ad77ee6b956e7eb9c867be858eced1811eb
parent d3ac01ff7616f7135b8b5044816690c93fba8548
parent 87234e8544370d86b305fc55d6a5021c38b65495
author Deepanshu Gupta <deepanshu@google.com> 1405720521 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405720521 +0000

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

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