tree 64f414deed58f4a87b363087a831595dd62e544e
parent 04870d07fabf7df356b805b6d6420665ed2dec37
parent 0ca2c68d5fa6d65d6b9aa9100c33dac1987b8f6f
author Elliott Hughes <enh@google.com> 1363039660 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363039660 -0700

am 0ca2c68d: Merge "Unit test updates for ICU 51 patches"

* commit '0ca2c68d5fa6d65d6b9aa9100c33dac1987b8f6f':
  Unit test updates for ICU 51 patches