OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b6aa28 62d9390)
am 62d9390d: (-s ours) am c61e53e7: am bdb583df: am 57c0cf45: (-s ours) am 71acfa6c...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 02:19:24 +0000 (02:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 02:19:24 +0000 (02:19 +0000)
* commit '62d9390d2696ab78dd395e902cc0f267df3dbbc7':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]


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