am 34baff19: am 99314f43: Merge "Fix old style edit text drawable display error."

* commit '34baff19d88679254d82420f798387f92a7fb912':
  Fix old style edit text drawable display error.