OSDN Git Service

am 0b878070: (-s ours) am 61b1fd5c: am e14b24f3: am 06ca4c6a: (-s ours) am 1281853a...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 19:07:35 +0000 (19:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 19:07:35 +0000 (19:07 +0000)
* commit '0b878070ed6f20580508a921ab0babff9826931b':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]


Trivial merge