tree f5f158caa46550c9144606d3c5d90bd7b6868528
parent 88f036925e3850c16c2bec29722dafca39d30430
parent 9edb6a948514ba3a2b39dec4e1817799b60a9db3
author Elliott Hughes <enh@google.com> 1354070716 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354070716 -0800

am 9edb6a94: Merge "ICU 49.2 upgrade"

* commit '9edb6a948514ba3a2b39dec4e1817799b60a9db3':
  ICU 49.2 upgrade