am 9c36ee9b: am 2ddfcc4a: Merge "Context leaks in EditText causes out of memory"

* commit '9c36ee9b4f42909c1a425322e4e2d3e86dd6edc5':
  Context leaks in EditText causes out of memory