OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74818cb cf76804)
am cf768044: (-s ours) am e9550087: am 874040d1: am 84f5acea: am 0b878070: (-s ours...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 19:29:32 +0000 (19:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 19:29:32 +0000 (19:29 +0000)
* commit 'cf768044cdbef02ba9c0d44f33c9f17735f91455':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help