tree 327b9396437fd9658f872e6810f0e3f5ffe96706
parent b58d385e17f3b71705f23fe77aa8c12147ec9ea5
parent 583a845c6eb6308d7ada72cb0e91444efc91cc54
author Elliott Hughes <enh@google.com> 1404952968 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404952968 +0000

am 583a845c: am 3964ea46: am d74f99d3: Merge "Switch frameworks/base/libs/androidfw to the new icu."

* commit '583a845c6eb6308d7ada72cb0e91444efc91cc54':
  Switch frameworks/base/libs/androidfw to the new icu.