tree 97f25cdab7686fb73cbc041a74f1c8a03e35f234
parent 8613f826289d627df07971f074a2852012fc98b7
parent 7f98066dd1a2a05d53ba39108dd4d44430e89c71
author Deepanshu Gupta <deepanshu@google.com> 1405720948 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405720948 +0000

am 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev

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