OSDN Git Service

am 9b1c46df: am 3c00b28b: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
authorDeepanshu Gupta <deepanshu@google.com>
Fri, 2 May 2014 19:30:30 +0000 (19:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 2 May 2014 19:30:30 +0000 (19:30 +0000)
* commit '9b1c46df60dec6af81b9cbfcbf8a70192da66d64':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]


Trivial merge