tree c864c6c1420c402ac258cfab1072a36314608c6d
parent f072fda13fd47d7dc7246cb821a26990d8fb271f
parent d74f99d390d9a0e1c800ee68b1bc39c210aca989
author Elliott Hughes <enh@google.com> 1404950913 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404950913 +0000

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

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