tree d6b8e8efa64a06777644e986c26c4981c81464fc
parent 7ba81ba530ce455d20c9d22217a344e086e9eac7
parent cce84066e183080b4c18d13fe08e134253abe0a8
author Geoff Mendal <mendal@google.com> 1434377485 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434377485 +0000

am 13eae792: (-s ours) am 26df3646: (-s ours) am 1ed87e5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '13eae7929f5defcbbb7342b6b09842e5c4f88bc2':
  Import translations. DO NOT MERGE