OSDN Git Service

am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib...
authorXavier Ducrohet <xav@google.com>
Thu, 20 Feb 2014 17:49:32 +0000 (17:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Feb 2014 17:49:32 +0000 (17:49 +0000)
commit9edf7a1159b528afa056e0d61ee4487ed310fe4c
tree693a938d06c7cc9157dab1d9bc88ca7dc243905d
parent65521c3cf169808cd02ce09a7344bc633d51c1fc
parent2cb9147fc49e6474eaf30fd833e43df10e42b899
am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev

* commit '2cb9147fc49e6474eaf30fd833e43df10e42b899':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]