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