tree aa862f70402b45443f92d412380fd0cedc8218b8
parent 62cf56cf99204bc3912119e8bed06e43f7ba6da9
parent 916d779650352059b08b7257f71a7aab8b333eba
author Deepanshu Gupta <deepanshu@google.com> 1414608688 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414608688 +0000

am 916d7796: am c55eb170: Merge "Fix multiple styles case in resource resolution." into lmp-dev

* commit '916d779650352059b08b7257f71a7aab8b333eba':
  Fix multiple styles case in resource resolution.