commit | d3001a48f30ceab327467099102d357b7918aab3 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu May 21 18:47:50 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 21 18:47:50 2015 +0000 |
tree | 585a8fc2051e96a346bb4a66f84aa3dd9ebffafc | |
parent | 919fbb6617d5d6094a415f0744f6f0499ef9a4ce [diff] | |
parent | 8c75a318446ff631f3b3b74dd6c70e1f501c1fde [diff] |
am 2d10c26e: (-s ours) am 2ab7e0d5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '2d10c26e35e133000de9b6340822f694310e4896': Import translations. DO NOT MERGE