OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 013af33 0031284)
am 00312846: (-s ours) am 0fe63473: am 04b4f8d1: Merge "Set default text style in...
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 16 Apr 2014 18:43:47 +0000 (18:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Apr 2014 18:43:47 +0000 (18:43 +0000)
* commit '00312846e1e5513b3b32aa4fab399e51daf0c1b3':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]


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