OSDN Git Service

am 23cee05b: am aa474ff0: (-s ours) am 9a61270d: Merge "LayoutLib: Fix EditText rende...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 22 Jul 2014 01:13:07 +0000 (01:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 22 Jul 2014 01:13:07 +0000 (01:13 +0000)
commita9252a159c0f579d8ae4e8f61562527d95d57ac4
tree18009cb824e896c324cc1cab44f9425c6ce291ae
parent4ad8eb68ab5277263eb329cd5e01861169d7e1f5
parentf89bff9ed875c1e3ad8e682e651c5994b246cc53
am 23cee05b: am aa474ff0: (-s ours) am 9a61270d: Merge "LayoutLib: Fix EditText rendering [DO NOT MERGE]" into klp-modular-dev

* commit '23cee05b6eedd41d6fdd97ac5fa6016c6f6478ce':
  LayoutLib: Fix EditText rendering [DO NOT MERGE]