commit | bf833850bf4adfd7413820919d7cccfdf9eba03a | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 21:55:04 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 21:55:04 2015 +0000 |
tree | 0f8cffc07327af3de47a38926817131e14ece34f | |
parent | 3d34591625c3d0a7cb7a9888d2358b405d015b7f [diff] | |
parent | 6e149a2537167f90b1db2430c19ccdf064548b91 [diff] |
am 6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '6e149a2537167f90b1db2430c19ccdf064548b91': Import translations. DO NOT MERGE