tree 676e4144ff27016790036e5246764fc560477c71
parent 56ca82191231f3aba1132e3db06e7e09a10ec6dc
parent cf4d85e4786beb98743eac68b71d67e36f76c058
author Elliott Hughes <enh@google.com> 1397863576 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397863576 +0000

am cf4d85e4: am 90840ec2: Merge "Fix warning introduced by recent psuedolocalizer change."

* commit 'cf4d85e4786beb98743eac68b71d67e36f76c058':
  Fix warning introduced by recent psuedolocalizer change.