OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c139177 9edf7a1)
am 9edf7a11: am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style...
authorXavier Ducrohet <xav@google.com>
Thu, 20 Feb 2014 17:53:20 +0000 (17:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Feb 2014 17:53:20 +0000 (17:53 +0000)
* commit '9edf7a1159b528afa056e0d61ee4487ed310fe4c':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]


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