am 1112a376: am 416362e6: Merge "Change StringTokenizer to TextUtils.StringSplitter"

* commit '1112a376e81af8ef4c2b661f5bda443596ba37da':
  Change StringTokenizer to TextUtils.StringSplitter