am 2f7e9d40: (-s ours) am 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread

* commit '2f7e9d403a8ef6660d3acf8c41f57ce339c9f7cc':
  SelectAllOnFocus shows a higlighted text. DO NOT MERGE.