commit | 5c59606e7c73816af945a7b511b26f663d453920 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 12 17:13:48 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 12 17:13:48 2015 +0000 |
tree | f45df24f8db1a9683729123a8c76e0f19b8323c4 | |
parent | a356afdaf31685e0bda3869f67b6b9c7433c0249 [diff] | |
parent | 8788bd837b608933ad909274ed4ed5adadaf4009 [diff] |
am 8788bd83: (-s ours) am 93c6f4fc: (-s ours) am 20625ebc: (-s ours) am 49848a63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '8788bd837b608933ad909274ed4ed5adadaf4009': Import translations. DO NOT MERGE