tree 94a2581b178728611004f124759d879a6fa95ae7
parent 2df48bed6afed4958835b8bdc2c8b44db32919fc
parent 14a4e69cc656b60c705d2f05229aed2a7049693c
author Deepanshu Gupta <deepanshu@google.com> 1405721820 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405721820 +0000

am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

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