OSDN Git Service

am f29a0516: am 0c11327b: (-s ours) am d4d66df6: am 26dd61c5: am 07009057: am effef17...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 18:26:13 +0000 (18:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 18:26:13 +0000 (18:26 +0000)
commit5806ec714ec9c001f2d58bc99e89376097f6f5f7
tree1ce19922396c657ebbc4d4da545cfa976999429d
parentb110aa8c3ec0069f71fc3d49f23ffd650ba6b50c
parentf29a05164708a3f37bad94c79bea81aa4c840afc
am f29a0516: am 0c11327b: (-s ours) am d4d66df6: am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]

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