tree 2756b5f7e29f1788a5b803e3225ddd6bd9ef36b0
parent 151192e2fa08cb1b7064e0ed0af6209174e7968d
parent e2c775e00b7f86c1c6b88788616a6217a673dd7c
author Elliott Hughes <enh@google.com> 1354070678 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354070678 -0800

am e2c775e0: Merge "ICU 49.2 upgrade."

* commit 'e2c775e00b7f86c1c6b88788616a6217a673dd7c':
  ICU 49.2 upgrade.