commit | e42bad45aad096abed85ed0a0cb92e07f906820f | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:53:28 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:53:28 2015 +0000 |
tree | 1c344e3a6deefc5bf4fd3fcc7a504f7b1491c5f8 | |
parent | 0283bd910268fec571b6e918778d352f92e06e7e [diff] | |
parent | 1aceaa3c2b19e352cf9f16c73fd03dab881a4434 [diff] |
am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '1aceaa3c2b19e352cf9f16c73fd03dab881a4434': Import translations. DO NOT MERGE