commit | 0184642b72d9b9413c444977b731a359e897e377 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:37:14 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:37:14 2015 +0000 |
tree | 156318d1e7602a679e0bb7d9834512a17995ea14 | |
parent | f81efca101f19f5801671e30caf25c0e8e3f22e8 [diff] | |
parent | 95b0388afa5b2f9f89b29019316da1a9455fc6c9 [diff] |
am 95b0388a: (-s ours) am e45179a2: (-s ours) am a6d84257: (-s ours) am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '95b0388afa5b2f9f89b29019316da1a9455fc6c9': Import translations. DO NOT MERGE